newrelic_rpm 3.9.8.273 → 3.9.9.275

data/CHANGELOG

@@ -1,5 +1,48 @@
 # New Relic Ruby Agent Release Notes #
 
+## v3.9.9 ##
+
+  * Support for Ruby 2.2
+
+  A new version of Ruby is available, and the Ruby agent is ready to run on
+  it. We've been testing things out since the early previews so you can
+  upgrade to the latest and greatest and use New Relic right away to see how
+  the new Ruby's performing for you.
+
+  * Support for Rails 4.2 and ActiveJob
+
+  Not only is a new Ruby available, but a new Rails is out too! The Ruby agent
+  provides all the usual support for Rails that you'd expect, and we
+  instrument the newly released ActiveJob framework that's part of 4.2.
+
+  * Security fix for handling of error responses from New Relic servers
+
+  This release fixes a potential security issue wherein an attacker who was able
+  to impersonate New Relic's servers could have triggered arbitrary code
+  execution in agent's host processes by sending a specially-crafted error
+  response to a data submission request.
+
+  This issue is mitigated by the fact that the agent uses SSL certificate
+  checking in order to verify the identity of the New Relic servers to which it
+  connects. SSL is enabled by default by the agent, and can be enforced
+  account-wide by enabling High Security Mode for your account:
+
+  https://docs.newrelic.com/docs/accounts-partnerships/accounts/security/high-security
+
+  * Fix for transactions with invalid URIs
+
+  If an application used the agent's `ignore_url_regexes` config setting to
+  ignore certain transactions, but received an invalid URI, the agent would
+  fail to record the transaction. This has been fixed.
+
+  * Fixed incompatibility with newrelic-grape
+
+  The 3.9.8 release of the Ruby agent included disabled prototyped
+  instrumentation for the Grape API framework. This introduced an
+  incompatibility with the existing third party extension newrelic-grape. This
+  has been fixed. Newrelic-grape continues to be the right solution until
+  full agent support for Grape is available.
+
 ## v3.9.8 ##
 
   * Custom Insights events API

data/README.md

@@ -21,7 +21,7 @@ automatically in Rails applications.
 
 ## Supported Environments
 
-* Ruby 1.8.7, REE, 1.9.x, 2.0.x, 2.1.x
+* Ruby 1.8.7, REE, 1.9.x, 2.0.x, 2.1.x, 2.2.x
 * JRuby 1.6 and 1.7
 * Rubinius 2.x (Experimental support only)
 * Rails 2.1 or later for Production Mode

data/lib/new_relic/agent/configuration/default_source.rb

@@ -7,6 +7,14 @@ require 'forwardable'
 module NewRelic
   module Agent
     module Configuration
+
+      # Helper since default Procs are evaluated in the context of this module
+      def self.value_of(key)
+        Proc.new do
+          NewRelic::Agent.config[key]
+        end
+      end
+
       class Boolean; end
 
       class DefaultSource
@@ -128,10 +136,6 @@ module NewRelic
           Proc.new { NewRelic::Agent::Threading::BacktraceService.is_supported? }
         end
 
-        def self.browser_monitoring_auto_instrument
-          Proc.new { NewRelic::Agent.config[:'rum.enabled'] }
-        end
-
         # This check supports the js_errors_beta key we've asked clients to
         # set. Once JS errors are GA, browser_monitoring.loader can stop
         # being dynamic.
@@ -139,46 +143,14 @@ module NewRelic
           Proc.new { NewRelic::Agent.config[:js_errors_beta] ? "full" : "rum"}
         end
 
-        def self.slow_sql_record_sql
-          Proc.new { NewRelic::Agent.config[:'transaction_tracer.record_sql'] }
-        end
-
-        def self.slow_sql_explain_enabled
-          Proc.new { NewRelic::Agent.config[:'transaction_tracer.explain_enabled'] }
-        end
-
-        def self.slow_sql_explain_threshold
-          Proc.new { NewRelic::Agent.config[:'transaction_tracer.explain_threshold'] }
-        end
-
-        def self.slow_sql_enabled
-          Proc.new { NewRelic::Agent.config[:'transaction_tracer.enabled'] }
-        end
-
         def self.transaction_tracer_transaction_threshold
           Proc.new { NewRelic::Agent.config[:apdex_t] * 4 }
         end
 
-        def self.disable_activerecord_instrumentation
-          Proc.new { NewRelic::Agent.config[:skip_ar_instrumentation] }
-        end
-
-        def self.api_port
-          Proc.new { NewRelic::Agent.config[:port] }
-        end
-
         def self.port
           Proc.new { NewRelic::Agent.config[:ssl] ? 443 : 80 }
         end
 
-        def self.strip_exception_messages_enabled
-          Proc.new { NewRelic::Agent.config[:high_security] }
-        end
-
-        def self.developer_mode
-          Proc.new { NewRelic::Agent.config[:developer] }
-        end
-
         def self.profiling_available
           Proc.new {
             begin
@@ -190,10 +162,6 @@ module NewRelic
           }
         end
 
-        def self.monitor_mode
-          Proc.new { NewRelic::Agent.config[:enabled] }
-        end
-
         def self.rules_ignore
           Proc.new do |rules|
             rules = convert_to_list(rules)
@@ -214,7 +182,6 @@ module NewRelic
             raise ArgumentError.new("Config value '#{value}' couldn't be turned into a list.")
           end
         end
-
       end
 
       AUTOSTART_BLACKLISTED_RAKE_TASKS = [
@@ -295,13 +262,13 @@ module NewRelic
           :description => 'Semicolon-delimited list of <a href="/docs/apm/new-relic-apm/installation-and-configuration/naming-your-application">application names</a> to which the agent will report metrics (e.g. \'MyApplication\' or \'MyAppStaging;Instance1\'). For more information, see <a href="/docs/apm/new-relic-apm/installation-and-configuration/naming-your-application">Naming your application</a>.'
         },
         :monitor_mode => {
-          :default => DefaultSource.monitor_mode,
+          :default => value_of(:enabled),
           :public => true,
           :type => Boolean,
           :description => 'Enable or disable the transmission of data to the New Relic <a href="/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a>).'
         },
         :developer_mode => {
-          :default => DefaultSource.developer_mode,
+          :default => value_of(:developer),
           :public => true,
           :type => Boolean,
           :description => 'Enable or disable developer mode, a local analytics package built into the agent for rack applications. Access developer mode analytics by visiting <b>/newrelic</b> in your application.'
@@ -429,7 +396,7 @@ module NewRelic
           :description => 'Enables or disables the agent for background processes. No longer necessary as the agent now automatically instruments background processes.'
         },
         :'strip_exception_messages.enabled' => {
-          :default => DefaultSource.strip_exception_messages_enabled,
+          :default => value_of(:high_security),
           :public => true,
           :type => Boolean,
           :description => 'Defines whether the agent should strip messages from all exceptions that are not specified in the whitelist. Enabled automatically in <a href="/docs/accounts-partnerships/accounts/security/high-security">high security mode</a>.'
@@ -459,7 +426,7 @@ module NewRelic
           :description => 'Port for the New Relic data collection service.'
         },
         :api_port => {
-          :default => DefaultSource.api_port,
+          :default => value_of(:port),
           :public => false,
           :type => Fixnum,
           :description => 'Port for the New Relic API host.'
@@ -623,7 +590,7 @@ module NewRelic
           :description => 'Enable or disable active record instrumentation.'
         },
         :disable_activerecord_instrumentation => {
-          :default => DefaultSource.disable_activerecord_instrumentation,
+          :default => value_of(:skip_ar_instrumentation),
           :public => true,
           :type => Boolean,
           :description => 'Enable or disable active record instrumentation.'
@@ -734,25 +701,25 @@ module NewRelic
           :description  => 'Defines whether the agent will install <a href="/docs/agents/ruby-agent/frameworks/mongo-instrumentation">instrumentation for the Mongo gem</a>.'
         },
         :'slow_sql.enabled' => {
-          :default => DefaultSource.slow_sql_enabled,
+          :default => value_of(:'transaction_tracer.enabled'),
           :public => true,
           :type => Boolean,
           :description => 'Enable or disable collection of slow SQL queries.'
         },
         :'slow_sql.explain_threshold' => {
-          :default => DefaultSource.slow_sql_explain_threshold,
+          :default => value_of(:'transaction_tracer.explain_threshold'),
           :public => true,
           :type => Float,
           :description => 'Defines a duration threshold, over which the agent will collect explain plans in slow SQL queries.'
         },
         :'slow_sql.explain_enabled' => {
-          :default => DefaultSource.slow_sql_explain_enabled,
+          :default => value_of(:'transaction_tracer.explain_enabled'),
           :public => true,
           :type => Boolean,
           :description => 'Enable or disable the collection of explain plans in slow SQL queries. If this setting is omitted, the transaction_tracer.explain_enabled setting will be applied as the default setting for explain plans in Slow SQL as well.'
         },
         :'slow_sql.record_sql' => {
-          :default => DefaultSource.slow_sql_record_sql,
+          :default => value_of(:'transaction_tracer.record_sql'),
           :public => true,
           :type => String,
           :description => 'Defines an obfuscation level for slow SQL queries. Valid options are <code>obfuscated</code>, <code>raw</code>, <code>none</code>).'
@@ -824,7 +791,7 @@ module NewRelic
           :description => 'Javascript agent file for real user monitoring.'
         },
         :'browser_monitoring.auto_instrument' => {
-          :default => DefaultSource.browser_monitoring_auto_instrument,
+          :default => value_of(:'rum.enabled'),
           :public => true,
           :type => Boolean,
           :description => 'Enable or disable automatic insertion of the JavaScript header into outgoing responses for page load timing (sometimes referred to as real user monitoring or RUM).'
@@ -1154,6 +1121,12 @@ module NewRelic
           :description  => 'Maximum number of custom Insights events buffered in memory at a time.',
           :dynamic_name => true
         },
+        :disable_grape_instrumentation => {
+          :default      => false,
+          :public       => true,
+          :type         => Boolean,
+          :description  => 'Disables installation of Grape instrumentation.'
+        },
         :disable_grape => {
           :default      => false,
           :public       => true,
@@ -1161,7 +1134,6 @@ module NewRelic
           :description  => 'Disables installation of Grape instrumentation.'
         }
       }.freeze
-
     end
   end
 end

data/lib/new_relic/agent/configuration/server_source.rb

@@ -31,10 +31,11 @@ module NewRelic
         # do the real enforcement there.
         def apply_feature_gates(server_config, existing_config)
           gated_features = {
-            :'transaction_tracer.enabled' => 'collect_traces',
-            :'slow_sql.enabled'           => 'collect_traces',
-            :'error_collector.enabled'    => 'collect_errors',
-            :'analytics_events.enabled'   => 'collect_analytics_events'
+            :'transaction_tracer.enabled'     => 'collect_traces',
+            :'slow_sql.enabled'               => 'collect_traces',
+            :'error_collector.enabled'        => 'collect_errors',
+            :'analytics_events.enabled'       => 'collect_analytics_events',
+            :'custom_insights_events.enabled' => 'collect_custom_events'
           }
           gated_features.each do |feature, gate_key|
             if server_config.has_key?(gate_key)

data/lib/new_relic/agent/instrumentation/grape.rb

@@ -14,7 +14,13 @@ module NewRelic
 end
 
 DependencyDetection.defer do
-  named :grape
+  # Why not just :grape? newrelic-grape used that name already, and while we're
+  # not shipping yet, overloading the name interferes with the plugin.
+  named :grape_instrumentation
+
+  depends_on do
+    ::NewRelic::Agent.config[:disable_grape] == false
+  end
 
   depends_on do
     defined?(::Grape::VERSION) &&

data/lib/new_relic/agent/new_relic_service/marshaller.rb

@@ -7,11 +7,21 @@ module NewRelic
     class NewRelicService
       class Marshaller
         def parsed_error(error)
-          error_class = error['error_type'].split('::') \
-            .inject(Module) {|mod,const| mod.const_get(const) }
-          error_class.new(error['message'])
-        rescue NameError
-          CollectorError.new("#{error['error_type']}: #{error['message']}")
+          error_type    = error['error_type']
+          error_message = error['message']
+
+          exception = case error_type
+          when 'NewRelic::Agent::LicenseException'
+            LicenseException.new(error_message)
+          when 'NewRelic::Agent::ForceRestartException'
+            ForceRestartException.new(error_message)
+          when 'NewRelic::Agent::ForceDisconnectException'
+            ForceDisconnectException.new(error_message)
+          else
+            CollectorError.new("#{error['error_type']}: #{error['message']}")
+          end
+
+          exception
         end
 
         def prepare(data, options={})

data/lib/new_relic/agent/supported_versions.rb

@@ -11,7 +11,7 @@ module NewRelic
       {
         :type        => :ruby,
         :name        => "MRI",
-        :supported   => ["1.8.7", "1.9.2", "1.9.3", "2.0.0", "~> 2.1.0"],
+        :supported   => ["1.8.7", "1.9.2", "1.9.3", "2.0.0", "~> 2.1.0", "~> 2.2.0" ],
         :deprecated  => ["1.8.6"],
         :url         => "https://www.ruby-lang.org",
         :feed        => "https://www.ruby-lang.org/en/feeds/news.rss",
@@ -85,7 +85,7 @@ module NewRelic
       :rails =>
       {
         :type        => :web,
-        :supported   => ["~>2.1.0", "~>2.2.0", "~>2.3.0", "~3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0"],
+        :supported   => ["~>2.1.0", "~>2.2.0", "~>2.3.0", "~3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0", "~>4.2.0"],
         :deprecated  => ["~>2.0.0"],
         :url         => "https://rubygems.org/gems/rails",
         :feed        => "https://rubygems.org/gems/rails/versions.atom",

data/lib/new_relic/agent/transaction.rb

@@ -182,6 +182,7 @@ module NewRelic
 
         :transaction_stopped
       rescue => e
+        state.reset
         NewRelic::Agent.logger.error("Exception during Transaction.stop", e)
         nil
       end
@@ -429,6 +430,9 @@ module NewRelic
         rules.any? do |rule|
           filtered_uri.match(rule)
         end
+      rescue URI::InvalidURIError => e
+        NewRelic::Agent.logger.debug("Error parsing URI: #{uri}", e)
+        false
       end
 
       def commit!(state, end_time, outermost_segment_name)

data/lib/new_relic/version.rb

@@ -12,7 +12,7 @@ module NewRelic
 
     MAJOR = 3
     MINOR = 9
-    TINY  = 8
+    TINY  = 9
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/test/environments/rails42/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rake'
 
-gem 'rails', '~>4.2.0.rc1'
+gem 'rails', '~>4.2.0'
 
 gem 'minitest', '5.2.3'
 gem 'mocha', :require => false

data/test/fixtures/cross_agent_tests/synthetics/README.md

@@ -0,0 +1,65 @@
+# Synthetics Tests
+
+The Synthetics tests are designed to verify that the agent handles valid and invalid Synthetics requests.
+
+Each test should run a simulated web transaction. A Synthetics HTTP request header is added to the incoming request at the beginning of a web transaction. During the course of the web transaction, an external request is made. And, at the completion of the web transaction, both a Transaction Trace and Transaction Event are recorded.
+
+Each test then verifies that the correct attributes are added to the Transaction Trace and Transaction Event, and the proper request header is added to the external request when required. Or, in the case of an invalid Synthetics request, that the attributes and request header are **not** added.
+
+## Name
+
+| Name | Meaning |
+| ---- | ------- |
+| `name` | A human-meaningful name for the test case. |
+
+## Settings
+
+The `settings` hash contains a number of key-value pairs that the agent will need to use for configuration for the test.
+
+| Name | Meaning |
+| ---- | ------- |
+| `agentEncodingKey`| The encoding key used by the agent for deobfuscation of the Synthetics request header. |
+| `syntheticsEncodingKey` | The encoding key used by Synthetics to obfuscate the Synthetics request header. In most tests, `encodingKey` and `syntheticsEncodingKey` are the same. |
+| `transactionGuid` | The GUID of the simulated transaction. In a non-simulated transaction, this will be randomly generated. But, for testing purposes, you should assign this value as the GUID, since the tests will check for this value to be set in the `nr.guid` attribute of the Transaction Event. |
+| `trustedAccountIds` | A list of accounts ids that the agent trusts. If the Synthetics request contains a non-trusted account id, it is an invalid request.|
+
+## Inputs
+
+The input for each test is a Synthetics request header. The test fixture file shows both the de-obfuscated version of the payload, as well as the resulting obfuscated version.
+
+| Name | Meaning |
+| ---- | ------- |
+| `inputHeaderPayload` | A decoded form of the contents of the `X-NewRelic-Synthetics` request header. |
+| `inputObfuscatedHeader` | An obfuscated form of the `X-NewRelic-Synthetics` request header. If you obfuscate `syntheticsHeaderPayload` using the CAT obfuscation algorithm, this should be the output. |
+
+## Outputs
+
+There are three different outputs that are tested for: Transaction Trace, Transaction Event, and External Request Header.
+
+### outputTransactionTrace
+
+The `outputTransactionTrace` hash contains three objects:
+
+| Name | Meaning |
+| ---- | ------- |
+| `header` | The last field of the transaction sample array should be set to the Synthetics Resource ID for a Synthetics request, and should be set to `null` if it isn't. (The last field in the array is the 10th element in the header array, but is `header[9]` in zero-based array notation, so the key name is `field_9`.) |
+| `expectedIntrinsics` | A set of key-value pairs that represent the attributes that should be set in the intrinsics section of the Transaction Trace. **Note**: If the agent has not implemented the Agent Attributes spec, then the agent should save the attributes in the `Custom` section, and the attribute names should have 'nr.' prepended to them. Read the spec for details. For agents in this situation, they will need to adjust the expected output of the tests accordingly. |
+| `nonExpectedIntrinsics` | An array of names that represent the attributes that should **not** be set in the intrinsics section of the Transaction Trace.|
+
+### outputTransactionEvent
+
+The `outputTransactionEvent` hash contains two objects:
+
+| Name | Meaning |
+| ---- | ------- |
+| `expectedAttributes` | A set of key-value pairs that represent the attributes that should be set in the `Intrinsic` hash of the Transaction Event. |
+| `nonExpectedAttributes` | An array of names that represent the attributes that should **not** be set in the `Intrinsic` hash of the Transaction Event. |
+
+### outputExternalRequestHeader
+
+The `outputExternalRequestHeader` hash contains two objects:
+
+| Name | Meaning |
+| ---- | ------- |
+| `expectedHeader` | The outbound header that should be added to external requests (similar to the CAT header), when the original request was made from a valid Synthetics request. |
+| `nonExpectedHeader` | The outbound header that should **not** be added to external requests, when the original request was made from a non-Synthetics request. |

data/test/fixtures/cross_agent_tests/synthetics/synthetics.json

@@ -314,4 +314,4 @@
       ]
     }
   }
-]
+]

data/test/multiverse/suites/agent_only/custom_analytics_events_test.rb

@@ -45,6 +45,22 @@ class CustomAnalyticsEventsTest < Minitest::Test
     assert_equal(good_event_type, events.first[0]['type'])
   end
 
+  def test_events_are_not_recorded_when_disabled_by_feature_gate
+    connect_response = {
+      'agent_run_id'          => 1,
+      'collect_custom_events' => false
+    }
+
+    $collector.stub('connect', connect_response)
+
+    trigger_agent_reconnect
+
+    NewRelic::Agent.record_custom_event('whatever', :foo => :bar)
+
+    NewRelic::Agent.agent.send(:harvest_and_send_analytic_event_data)
+    assert_equal(0, $collector.calls_for(:custom_event_data).size)
+  end
+
   def last_custom_event_submission
     submissions = $collector.calls_for('custom_event_data')
     assert_equal(1, submissions.size)

data/test/multiverse/suites/rails/Envfile

@@ -1,6 +1,6 @@
 if RUBY_VERSION >= '1.9.3'
   gemfile <<-RB
-    gem 'rails', '~>4.2.0.rc1'
+    gem 'rails', '~>4.2.0'
     gem 'haml', :require => false
     gem 'minitest', '5.2.3'
   RB

data/test/multiverse/suites/rails/view_instrumentation_test.rb

@@ -97,8 +97,7 @@ class ViewInstrumentationTest < RailsMultiverseTest
     end
   end
 
-  # https://github.com/rails/rails/pull/17862 for 4.2.0.rc1 _generate_paths_by_default
-  (ViewsController.action_methods - ['raise_render', '_generate_paths_by_default']).each do |method|
+  (ViewsController.action_methods - ['raise_render']).each do |method|
 
     # proc rendering doesn't work on Rails 2
     next if method == 'proc_render' && Rails::VERSION::MAJOR <= 2

data/test/multiverse/suites/sinatra/Envfile

@@ -1,10 +1,12 @@
 gemfile <<-RB
   gem 'sinatra', '~> 1.4.5'
+  gem 'rack',    '~> 1.5.0'
   gem 'rack-test', :require => 'rack/test'
 RB
 
 gemfile <<-RB
   gem 'sinatra', '~> 1.3.6'
+  gem 'rack',    '~> 1.5.0'
   gem 'rack-test', :require => 'rack/test'
 RB
 

data/test/new_relic/agent/configuration/manager_test.rb

@@ -396,6 +396,20 @@ module NewRelic::Agent::Configuration
       end
     end
 
+    def test_default_to_value_of
+      with_config(:port => 8888) do
+        result = @manager.fetch(:api_port)
+        assert_equal 8888, result
+      end
+    end
+
+    def test_default_to_value_of_only_happens_at_defaults
+      with_config(:port => 8888, :api_port => 3000) do
+        result = @manager.fetch(:api_port)
+        assert_equal 3000, result
+      end
+    end
+
     def test_evaluate_procs_returns_evaluated_value_if_it_responds_to_call
       callable = Proc.new { 'test' }
       assert_equal 'test', @manager.evaluate_procs(callable)

data/test/new_relic/agent/configuration/orphan_configuration_test.rb

@@ -30,6 +30,7 @@ class OrphanedConfigTest < Minitest::Test
   end
 
   AGENT_CONFIG_PATTERN      = /Agent\.config\[:['"]?([a-z\._]+)['"]?\s*\]/
+  DEFAULT_VALUE_OF_PATTERN  = /:default\s*=>\s*value_of\(:['"]?([a-z\._]+)['"]?\)\s*/
   REGISTER_CALLBACK_PATTERN = /register_callback\(:['"]?([a-z\._]+)['"]?\)/
   NAMED_DEPENDENCY_PATTERN  = /^\s*named[ (]+\:?([a-z0-9\._]+).*$/
 
@@ -38,6 +39,7 @@ class OrphanedConfigTest < Minitest::Test
       lines_in(file).each do |line|
         captures = []
         captures << line.scan(AGENT_CONFIG_PATTERN)
+        captures << line.scan(DEFAULT_VALUE_OF_PATTERN)
         captures << line.scan(REGISTER_CALLBACK_PATTERN)
         captures << line.scan(NAMED_DEPENDENCY_PATTERN).map(&method(:disable_name))
 

data/test/new_relic/agent/configuration/server_source_test.rb

@@ -55,37 +55,44 @@ module NewRelic::Agent::Configuration
       rsp = {
         'collect_errors' => false,
         'collect_traces' => false,
-        'collect_analytics_events' => false
+        'collect_analytics_events' => false,
+        'collect_custom_events'    => false
       }
       existing_config = {
-        :'error_collector.enabled'    => true,
-        :'slow_sql.enabled'           => true,
-        :'transaction_tracer.enabled' => true,
-        :'analytics_events.enabled'   => true
+        :'error_collector.enabled'        => true,
+        :'slow_sql.enabled'               => true,
+        :'transaction_tracer.enabled'     => true,
+        :'analytics_events.enabled'       => true,
+        :'custom_insights_events.enabled' => true
       }
       @source = ServerSource.new(rsp, existing_config)
-      assert !@source[:'error_collector.enabled']
-      assert !@source[:'slow_sql.enabled']
-      assert !@source[:'transaction_tracer.enabled']
+      refute @source[:'error_collector.enabled']
+      refute @source[:'slow_sql.enabled']
+      refute @source[:'transaction_tracer.enabled']
+      refute @source[:'analytics_events.enabled']
+      refute @source[:'custom_insights_events.enabled']
     end
 
     def test_should_enable_gated_features_when_server_says_to
       rsp = {
         'collect_errors' => true,
         'collect_traces' => true,
-        'collect_analytics_events' => true
+        'collect_analytics_events' => true,
+        'collect_custom_events'    => true
       }
       existing_config = {
-        :'error_collector.enabled'    => true,
-        :'slow_sql.enabled'           => true,
-        :'transaction_tracer.enabled' => true,
-        :'analytics_events.enabled'   => true
+        :'error_collector.enabled'        => true,
+        :'slow_sql.enabled'               => true,
+        :'transaction_tracer.enabled'     => true,
+        :'analytics_events.enabled'       => true,
+        :'custom_insights_events.enabled' => true
       }
       @source = ServerSource.new(rsp, existing_config)
       assert @source[:'error_collector.enabled']
       assert @source[:'slow_sql.enabled']
       assert @source[:'transaction_tracer.enabled']
       assert @source[:'analytics_events.enabled']
+      assert @source[:'custom_insights_events.enabled']
     end
 
     def test_should_allow_manual_disable_of_gated_features
@@ -112,18 +119,21 @@ module NewRelic::Agent::Configuration
         'collect_errors' => true,
         'collect_traces' => true,
         'collect_analytics_events' => true,
+        'collect_custom_events'    => true,
         'agent_config' => {
-          'transaction_tracer.enabled' => true,
-          'slow_sql.enabled'           => true,
-          'error_collector.enabled'    => true,
-          'analytics_events.enabled'   => true
+          'transaction_tracer.enabled'     => true,
+          'slow_sql.enabled'               => true,
+          'error_collector.enabled'        => true,
+          'analytics_events.enabled'       => true,
+          'custom_insights_events.enabled' => true
         }
       }
       existing_config = {
-        :'error_collector.enabled'    => false,
-        :'slow_sql.enabled'           => false,
-        :'transaction_tracer.enabled' => false,
-        :'analytics_events.enabled'   => false
+        :'error_collector.enabled'        => false,
+        :'slow_sql.enabled'               => false,
+        :'transaction_tracer.enabled'     => false,
+        :'analytics_events.enabled'       => false,
+        :'custom_insights_events.enabled' => false
       }
       @source = ServerSource.new(rsp, existing_config)
       assert @source[:'error_collector.enabled']
@@ -135,10 +145,11 @@ module NewRelic::Agent::Configuration
     def test_should_not_gate_when_gating_keys_absent
       rsp = {
         'agent_config' => {
-          'transaction_tracer.enabled' => true,
-          'slow_sql.enabled'           => true,
-          'error_collector.enabled'    => true,
-          'analytics_events.enabled'   => true
+          'transaction_tracer.enabled'     => true,
+          'slow_sql.enabled'               => true,
+          'error_collector.enabled'        => true,
+          'analytics_events.enabled'       => true,
+          'custom_insights_events.enabled' => true
         }
       }
       @source = ServerSource.new(rsp, {})
@@ -146,6 +157,7 @@ module NewRelic::Agent::Configuration
       assert @source[:'slow_sql.enabled']
       assert @source[:'transaction_tracer.enabled']
       assert @source[:'analytics_events.enabled']
+      assert @source[:'custom_insights_events.enabled']
     end
   end
 end

data/test/new_relic/agent/new_relic_service_test.rb

@@ -647,7 +647,7 @@ class NewRelicServiceTest < Minitest::Test
     assert_equal([[['dcba']]], prepared)
   end
 
-  def test_marshaller_handles_known_errors
+  def test_marshaller_handles_force_restart_exception
     error_data = {
       'error_type' => 'NewRelic::Agent::ForceRestartException',
       'message'    => 'test'
@@ -657,6 +657,26 @@ class NewRelicServiceTest < Minitest::Test
     assert_equal 'test', error.message
   end
 
+  def test_marshaller_handles_force_disconnect_exception
+    error_data = {
+      'error_type' => 'NewRelic::Agent::ForceDisconnectException',
+      'message'    => 'test'
+    }
+    error = @service.marshaller.parsed_error(error_data)
+    assert_equal NewRelic::Agent::ForceDisconnectException, error.class
+    assert_equal 'test', error.message
+  end
+
+  def test_marshaller_handles_license_exception
+    error_data = {
+      'error_type' => 'NewRelic::Agent::LicenseException',
+      'message'    => 'test'
+    }
+    error = @service.marshaller.parsed_error(error_data)
+    assert_equal NewRelic::Agent::LicenseException, error.class
+    assert_equal 'test', error.message
+  end
+
   def test_marshaller_handles_unknown_errors
     error = @service.marshaller.parsed_error('error_type' => 'OogBooga',
                                              'message' => 'test')

data/test/new_relic/agent/transaction_test.rb

@@ -1012,6 +1012,35 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     end
   end
 
+  def test_user_defined_rules_ignore_logs_uri_parsing_failures
+    with_config(:rules => { :ignore_url_regexes => ['notempty'] }) do
+      in_transaction do |txn|
+        txn.stubs(:uri).returns('http://foo bar.com')
+        NewRelic::Agent.logger.expects(:debug)
+        NewRelic::Agent.logger.expects(:debug).with(regexp_matches(/foo bar.com/), anything).at_least_once
+      end
+    end
+  end
+
+  def test_user_defined_rules_ignore_returns_false_if_cannot_parse_uri
+    with_config(:rules => { :ignore_url_regexes => ['notempty'] }) do
+      in_transaction do |txn|
+        txn.stubs(:uri).returns('http://foo bar.com')
+        refute txn.user_defined_rules_ignore?
+      end
+    end
+  end
+
+  def test_stop_resets_the_transaction_state_if_there_is_an_error
+    in_transaction do |txn|
+      state = mock
+      state.stubs(:current_transaction).raises(StandardError, 'StandardError')
+
+      state.expects(:reset)
+      NewRelic::Agent::Transaction.stop(state)
+    end
+  end
+
   def test_doesnt_record_queue_time_if_it_is_zero
     in_transaction('boo') do
       # nothing

data/test/performance/suites/rack_middleware.rb

@@ -47,7 +47,6 @@ class RackMiddleware < Performance::TestCase
 
     @config = {
       :beacon                 => 'beacon',
-      :disable_mobile_headers => false,
       :browser_key            => 'browserKey',
       :js_agent_loader        => 'loader',
       :encoding_key           => 'lolz',

data/test/performance/suites/rum_autoinsertion.rb

@@ -14,11 +14,9 @@ class RumAutoInsertion < Performance::TestCase
     NewRelic::Agent.manual_start
     @config = {
       :beacon                 => 'beacon',
-      :disable_mobile_headers => false,
       :browser_key            => 'browserKey',
       :application_id         => '5, 6', # collector can return app multiple ids
       :'rum.enabled'          => true,
-      :episodes_file          => 'this_is_my_file',
       :license_key            => 'a' * 40,
       :js_agent_loader        => 'loader'
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.9.8.273
+  version: 3.9.9.275
   prerelease: 
 platform: ruby
 authors:
@@ -41,7 +41,7 @@ cert_chain:
   K0ZZTXduQWIrVm1OT2h2MVMrc0poYmpaMzBQS2d6NnZMaFQ2dW5pZUNqTGs5
   d0dHbWxTSwpZamJudkE5cXJhTExhalNqCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -703,7 +703,6 @@ files:
 - test/fixtures/cross_agent_tests/proc_meminfo/meminfo_4096MB.txt
 - test/fixtures/cross_agent_tests/rules.json
 - test/fixtures/cross_agent_tests/rum_client_config.json
-- test/fixtures/cross_agent_tests/rum_cookie.json
 - test/fixtures/cross_agent_tests/rum_footer_insertion_location/close-body-in-comment.html
 - test/fixtures/cross_agent_tests/rum_footer_insertion_location/dynamic-iframe.html
 - test/fixtures/cross_agent_tests/rum_loader_insertion_location/basic.html
@@ -798,6 +797,7 @@ files:
 - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_twin_single_quotes.obfuscated
 - test/fixtures/cross_agent_tests/sql_obfuscation/string_with_twin_single_quotes.sql
 - test/fixtures/cross_agent_tests/sql_parsing.json
+- test/fixtures/cross_agent_tests/synthetics/README.md
 - test/fixtures/cross_agent_tests/synthetics/synthetics.json
 - test/fixtures/cross_agent_tests/transaction_segment_terms.json
 - test/fixtures/cross_agent_tests/url_clean.json

metadata.gz.sig

@@ -1 +1 @@
-`�E�.|��:s�c�j��l��G�)J�̡}b�M>�@U�2Q�L�6�:AE�ۂ��
�rc�ؓ�t��kgM�R\a��۟u) ����
3�S#�
�+�7�Tmz���XX�+�A󷆅ŚÏ?03�Y(���t�=��	�9�+�]2�flO#��4�k/_^}�C�Ɩ;������^�1!�wg">)��Ā ˶���f�^�璯Ða��LM�`EcI���a�1o~�R�q)C���#�!R$>����/�22-/�ltŐ��ǒ�C
+e'�K�I?+ϩ�@	�����2K�M
;-�Y� ‡�K�NB�5H�^b��k��ot�@�2�;�����\90�9���Ί���������F�,�Y���*����z��z���V�h2��hP��;��l2WRK���Y����R?���@���t��tç�O�K�

data/test/fixtures/cross_agent_tests/rum_cookie.json

@@ -1,17 +0,0 @@
-[
-  {"testname":"empty cookie",        "input":"",                      "expected":""},
-  {"testname":"long cookie",         "input":"tk=0123456789ABCDEFAA", "expected":""},
-  {"testname":"short cookie",        "input":"tk=0123456789ABC",      "expected":""},
-  {"testname":"improper cookie",     "input":"t==0123456789ABCDEF",   "expected":""},
-  {"testname":"improper cookie",     "input":"tk-0123456789ABCDEF",   "expected":""},
-  {"testname":"invalid character",   "input":"tk=0123456789ABCDE\"",  "expected":""},
-  {"testname":"invalid character",   "input":"tk=0123456789ABCDE<",   "expected":""},
-  {"testname":"invalid character",   "input":"tk=0123456789ABCDE'",   "expected":""},
-  {"testname":"invalid character",   "input":"tk=0123456789ABCDE>",   "expected":""},
-  {"testname":"invalid character",   "input":"tk=0123456789ABCDE]",   "expected":""},
-  {"testname":"invalid character",   "input":"tk=0123456789ABCDE+",   "expected":""},
-  {"testname":"good cookie",         "input":"tk=0123456789ABCDEF",   "expected":"0123456789ABCDEF"},
-  {"testname":"good cookie a-z",     "input":"tk=aaaaaaznnzzazzzz",   "expected":"aaaaaaznnzzazzzz"},
-  {"testname":"good cookie A-Z",     "input":"tk=AAAAAAZNNZZAZZZZ",   "expected":"AAAAAAZNNZZAZZZZ"},
-  {"testname":"good cookie numbers", "input":"tk=0123456789567891",   "expected":"0123456789567891"}
-]