Merge pull request #1639 from ruby-agent/dev

4.7.1 RC 1
newrelic · Dec 21, 2017 · 1b00e2b · 1b00e2b
2 parents 6c0c1f0 + 55d1b69
commit 1b00e2b
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## 4.7.1 ##
+
+  * Bugfix for Manual Browser Instrumentation
+
+  There was a previous bug that required setting both `rum.enabled: false` and
+  `browser.auto_instrument: false` to completely disable browser monitoring. An
+  attempt to fix this in 4.7.0 resulted in breaking manual browser
+  instrumentation. Those changes have been reverted.
+
   ## v4.7.0 ##
 
   * Expected Error API

diff --git a/lib/new_relic/agent/javascript_instrumentor.rb b/lib/new_relic/agent/javascript_instrumentor.rb
@@ -23,13 +23,13 @@ def log_configuration
                                      "JS agent loader debug: #{NewRelic::Agent.config[:'browser_monitoring.debug']}",
                                      "JS agent loader version: #{NewRelic::Agent.config[:'browser_monitoring.loader_version']}")
 
-        if !NewRelic::Agent.config[:'browser_monitoring.auto_instrument']
+        if !NewRelic::Agent.config[:'rum.enabled']
           NewRelic::Agent.logger.debug("Real User Monitoring is disabled for this agent. Edit your configuration to change this.")
         end
       end
 
       def enabled?
-        Agent.config[:'browser_monitoring.auto_instrument'] && !!Agent.config[:beacon]
+        Agent.config[:'rum.enabled'] && !!Agent.config[:beacon]
       end
 
       def obfuscator

diff --git a/lib/new_relic/version.rb b/lib/new_relic/version.rb
@@ -12,7 +12,7 @@ def self.build_version_string(*parts)
 
     MAJOR = 4
     MINOR = 7
-    TINY  = 0
+    TINY  = 1
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

diff --git a/test/multiverse/suites/rack/rack_cascade_test.rb b/test/multiverse/suites/rack/rack_cascade_test.rb
@@ -12,12 +12,12 @@ class RackCascadeTest < Minitest::Test
   include MultiverseHelpers
 
   setup_and_teardown_agent(
-    :beacon                               => 'beacon',
-    :browser_key                          => 'browserKey',
-    :js_agent_loader                      => 'loader',
-    :application_id                       => '5',
-    :'browser_monitoring.auto_instrument' => true,
-    :license_key                          => 'a' * 40
+    :beacon                 => 'beacon',
+    :browser_key            => 'browserKey',
+    :js_agent_loader        => 'loader',
+    :application_id         => '5',
+    :'rum.enabled'          => true,
+    :license_key            => 'a' * 40
   )
 
   include Rack::Test::Methods

diff --git a/test/new_relic/agent/javascript_instrumentor_test.rb b/test/new_relic/agent/javascript_instrumentor_test.rb
@@ -11,13 +11,13 @@ class NewRelic::Agent::JavascriptInstrumentorTest < Minitest::Test
 
   def setup
     @config = {
-      :application_id                       => '5, 6', # collector can return app multiple ids
-      :beacon                               => 'beacon',
-      :browser_key                          => 'browserKey',
-      :js_agent_loader                      => 'loader',
-      :license_key                          => "\0",  # no-op obfuscation key
-      :'browser_monitoring.auto_instrument' => true,
-      :disable_harvest_thread               => true
+      :application_id         => '5, 6', # collector can return app multiple ids
+      :beacon                 => 'beacon',
+      :browser_key            => 'browserKey',
+      :js_agent_loader        => 'loader',
+      :license_key            => "\0",  # no-op obfuscation key
+      :'rum.enabled'          => true,
+      :disable_harvest_thread => true
     }
     NewRelic::Agent.config.add_config_for_testing(@config)
 
@@ -58,8 +58,8 @@ def test_browser_timing_header_outside_transaction
     assert_equal "", instrumentor.browser_timing_header
   end
 
-  def test_browser_timing_scripts_with_browser_auto_instrument_false
-    with_config(:'browser_monitoring.auto_instrument' => false) do
+  def test_browser_timing_scripts_with_rum_enabled_false
+    with_config(:'rum.enabled' => false) do
       in_transaction do
         assert_equal "", instrumentor.browser_timing_header
       end

diff --git a/test/new_relic/rack/browser_monitoring_test.rb b/test/new_relic/rack/browser_monitoring_test.rb
@@ -58,13 +58,13 @@ def setup
     freeze_time
 
     @config = {
-      :application_id                       => 5,
-      :beacon                               => 'beacon',
-      :browser_key                          => 'some browser key',
-      :'browser_monitoring.auto_instrument' => true,
-      :license_key                          => 'a' * 40,
-      :js_agent_loader                      => 'loader',
-      :disable_harvest_thread               => true
+      :application_id => 5,
+      :beacon => 'beacon',
+      :browser_key => 'some browser key',
+      :'rum.enabled' => true,
+      :license_key => 'a' * 40,
+      :js_agent_loader => 'loader',
+      :disable_harvest_thread => true
     }
     NewRelic::Agent.config.add_config_for_testing(@config)
   end

diff --git a/test/performance/suites/rack_middleware.rb b/test/performance/suites/rack_middleware.rb
@@ -61,13 +61,13 @@ def setup
     require 'new_relic/rack/browser_monitoring'
 
     @config = {
-      :beacon                               => 'beacon',
-      :browser_key                          => 'browserKey',
-      :js_agent_loader                      => 'loader',
-      :encoding_key                         => 'lolz',
-      :application_id                       => '5, 6', # collector can return app multiple ids
-      :'browser_monitoring.auto_instrument' => true,
-      :license_key                          => 'a' * 40
+      :beacon          => 'beacon',
+      :browser_key     => 'browserKey',
+      :js_agent_loader => 'loader',
+      :encoding_key    => 'lolz',
+      :application_id  => '5, 6', # collector can return app multiple ids
+      :'rum.enabled'   => true,
+      :license_key     => 'a' * 40
     }
     NewRelic::Agent.config.add_config_for_testing(@config)