newrelic_rpm 4.0.0.332 → 4.4.0.336

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f033acf8bf5efe89fd548f55aba3e3b7b9c58e2
-  data.tar.gz: 0e523aeaaca318f6bf863c4f7b9269d4b212f63a
+  metadata.gz: b9d189b04c1171316153a227be91c6abad18f00a
+  data.tar.gz: 2b1c100c3778ba5fa95937d6d87bbe9949fb99a1
 SHA512:
-  metadata.gz: 9b18921ad5e63244778c06a6d45fcf7fa556a19cac8eb61f58cdfce341033ea87c9e9c3eb1832c8c5c3dd4ce9ad30030340497772c5a1144bfd408b2be0dfd0e
-  data.tar.gz: 809cc815755c0d2be8555ac9e8bec2d057a849617e196e62644131588d7c8a697f19f1e91a1f73f0c4ace692efbd1d7ece2ce7996548a2f1828c7cd56b0649a9
+  metadata.gz: e77e92639fc53364aaf68627c4d41f1bc9e61ad6f2ce1978732d206a3b7eaf84ee72f06a934a92087179b3c534ea4803d7da5fe6d134416bd32b14f1e7532483
+  data.tar.gz: 566143ee90b3f3c027cb4201824766986d62c66cc78f2311da53861f23dcd272deb528dabceb36efd37db5fcc8e9f8b28f45d12f3729362feea58044dbe87b76

data/.travis.yml

@@ -2,6 +2,7 @@ services:
   - mysql
   - redis-server
   - memcached
+  - rabbitmq
 
 language: ruby
 
@@ -31,10 +32,10 @@ notifications:
 
 rvm:
   # Run slowest builds first to try and optimize overall cycle time.
-  - jruby-9.1.2.0
-  - 2.4.0
-  - 2.3.3
-  - 2.2.6
+  - jruby-9.1.12.0
+  - 2.4.1
+  - 2.3.4
+  - 2.2.7
   - 2.1.10
   - 2.0.0-p648
 
@@ -61,6 +62,7 @@ env:
     - TYPE=UNIT ENVIRONMENT=rails41
     - TYPE=UNIT ENVIRONMENT=rails42
     - TYPE=UNIT ENVIRONMENT=rails50
+    - TYPE=UNIT ENVIRONMENT=rails51
     - TYPE=UNIT ENVIRONMENT=norails
     - TYPE=FUNCTIONAL GROUP=agent
     - TYPE=FUNCTIONAL GROUP=api
@@ -79,39 +81,39 @@ matrix:
   exclude:
     # Unsupported Rails/Ruby combinations
     # 2.4
-    - rvm: 2.4.0
+    - rvm: 2.4.1
       env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.4.0
+    - rvm: 2.4.1
       env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.4.0
+    - rvm: 2.4.1
       env: TYPE=UNIT ENVIRONMENT=rails23
-    - rvm: 2.4.0
+    - rvm: 2.4.1
       env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: 2.4.0
+    - rvm: 2.4.1
       env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: 2.4.0
+    - rvm: 2.4.1
       env: TYPE=UNIT ENVIRONMENT=rails32
-    - rvm: 2.4.0
+    - rvm: 2.4.1
       env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: 2.4.0
+    - rvm: 2.4.1
       env: TYPE=UNIT ENVIRONMENT=rails41
-    - rvm: 2.4.0
+    - rvm: 2.4.1
       env: TYPE=UNIT ENVIRONMENT=rails42
 
     # 2.3
-    - rvm: 2.3.3
+    - rvm: 2.3.4
       env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.3.3
+    - rvm: 2.3.4
       env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.3.3
+    - rvm: 2.3.4
       env: TYPE=UNIT ENVIRONMENT=rails23
 
     # 2.2
-    - rvm: 2.2.6
+    - rvm: 2.2.7
       env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.2.6
+    - rvm: 2.2.7
       env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.2.6
+    - rvm: 2.2.7
       env: TYPE=UNIT ENVIRONMENT=rails23
 
     # 2.1
@@ -123,6 +125,8 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails23
     - rvm: 2.1.10
       env: TYPE=UNIT ENVIRONMENT=rails50
+    - rvm: 2.1.10
+      env: TYPE=UNIT ENVIRONMENT=rails51
 
     # 2.0
     - rvm: 2.0.0-p648
@@ -133,17 +137,19 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails23
     - rvm: 2.0.0-p648
       env: TYPE=UNIT ENVIRONMENT=rails50
+    - rvm: 2.0.0-p648
+      env: TYPE=UNIT ENVIRONMENT=rails51
 
     # jruby 9.0
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.12.0
       env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.12.0
       env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.12.0
       env: TYPE=UNIT ENVIRONMENT=rails23
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.12.0
       env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.12.0
       env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: jruby-9.1.2.0
+    - rvm: jruby-9.1.12.0
       env: TYPE=UNIT ENVIRONMENT=rails32

data/.yardopts

@@ -7,10 +7,10 @@ lib/new_relic/agent/instrumentation/rack.rb
 lib/new_relic/agent/instrumentation/metric_frame.rb
 lib/new_relic/agent/stats_engine/metric_stats.rb
 lib/new_relic/agent/datastores.rb
+lib/new_relic/agent/messaging.rb
 lib/new_relic/agent/sql_sampler.rb
 lib/new_relic/agent/transaction.rb
 lib/new_relic/agent/transaction_sampler.rb
-lib/new_relic/rack/developer_mode.rb
 lib/new_relic/rack/agent_hooks.rb
 lib/new_relic/rack/browser_monitoring.rb
 lib/new_relic/rack/error_collector.rb

data/CHANGELOG.md

@@ -1,5 +1,131 @@
 # New Relic Ruby Agent Release Notes #
 
+## v4.4.0 ##
+
+  * Include test helper for 3rd party use
+
+  In 4.2.0, all test files were excluded from being packaged in the gem. An
+  agent class method `NewRelic::Agent.require_test_helper` was used by 3rd
+  party gem authors to test extensions to the agent. The required file is now
+  included in the gem.
+
+  * Collect cloud metadata from Azure, GCP, PCF, and AWS cloud platform
+
+  The agent now collects additional metadata when running in AWS, GCP, Azure, and
+  PCF. This information is used to provide an enhanced experience when the agent
+  is deployed on those platforms.
+
+  * Install `at_exit` hook when running JRuby
+
+  The agent now installs an `at_exit` hook when running JRuby, which wasn't
+  done before because of constraints related to older JRuby versions that
+  are no longer supported.
+
+  * User/Utilization and System/Utilization metrics not recorded after Resque forks
+
+  The agent no longer records invalid User/Utilization and System/Utilization
+  metrics, which can lead to negative values, in forks of Resque processes.
+
+  * Add `identifier` field to agent connect settings
+
+  The agent now includes a unique identifier in its connect settings, ensuring
+  that when multiple agents connect to multiple different apps, data are reported
+  for each of the apps.
+
+  * Clear transaction state after forking now opt-in
+
+  The agent waits to connect until the first web request when it detects it's
+  running in a forking dispatcher. When clearing the transaction state in this
+  situation we lose the first frame of the transaction and the subsequent
+  trace becomes corrupted. We've made this feature opt-in and is turned off by
+  default. This behavior only affects the first transaction after a dispatcher
+  forks.
+
+## v4.3.0 ##
+
+  * Instrumentation for the Bunny AMQP Client
+
+  The Bunny AMQP Client is now automatically instrumented. The agent will
+  report data for messages sent and received by an application. Data on messages
+  is available in both APM and Insights. Applications connected through a
+  RabbitMQ exchange will now also be visible on Service Maps as part of Cross
+  Application Tracing. See the [message queues documentation page](https://docs.newrelic.com/docs/agents/ruby-agent/features/message-queues)
+  for more details.
+
+  * Safely normalize external hostnames
+
+  The agent has been updated to check for nil host values before downcasing the
+  hostname. Thanks Rafael Valério for the contribution!
+
+  * PageView events will not be generated for ignored transactions
+
+  The agent now checks if transaction is ignored before injecting the New Relic
+  Browser Agent. This will prevent PageView events from being generated for
+  ignored transactions.
+
+  * Datastores required explicitly in agent
+
+  The agent has been modified to explicity `require` the Datastores module
+  whereas previously there were situations where the module could be
+  implicitly defined. Thanks Kevin Griffin for the contribution!
+
+  * Clear transaction state after forking
+
+  Previously, if a transaction was started and the process forks, the transaction
+  state survived the fork and `#after_fork` call in thread local storage. Now,
+  this state is cleared by `#after_fork`.
+
+  * Postgis adapter reports as Postgres for datastores
+
+  The agent now maps the Postgis adapter to Postgres for datastore metrics.
+  Thanks Vojtěch Vondra for the contribution!
+
+  * Deprecate `:trace_only` option
+
+  The `NewRelic::Agent.notice_error` API has been updated to deprecate the
+  `:trace_only` option in favor of `:expected`.
+
+## v4.2.0 ##
+
+  * Sinatra 2.0 and Padrino 0.14.x Support
+
+  The agent has been verified against the latest versions of Sinatra and Padrino.
+
+  * Rails 5.1 Support
+
+  The Ruby agent has been validated against the latest release of Ruby on Rails!
+
+  * APP_ENV considered when determining environment
+
+  The agent will now consider the APP_ENV environment when starting up.
+
+  * Test files excluded from gem
+
+  The gemspec has been updated to exclude test files from being packaged into the
+  gem. Thanks dimko for the contribution!
+
+## v4.1.0 ##
+
+  * Developer Mode removed
+
+  The Ruby Agent's Developer Mode, which provided a very limited view of your
+  application performance data, has been removed. For more information, check
+  out our [community forum](https://discuss.newrelic.com/t/feedback-on-the-ruby-agent-s-developer-mode/46957).
+
+  * Support NEW_RELIC_ENV for Rails apps
+
+  Previously, users could set the agent environment with NEW_RELIC_ENV only
+  for non-Rails apps. For Rails app, the agent environment would use whatever
+  the Rails environment was set to. Now, NEW_RELIC_ENV can also be used for
+  Rails apps, so that it is possible to have an agent environment that is
+  different from the Rails environment. Thanks Andrea Campolonghi for the
+  contribution, as well as Steve Schwartz for also looking into this issue!
+
+  * Normalization of external hostnames
+
+  Hostnames from URIs used in external HTTP requests are now always downcased
+  to prevent duplicate metrics when only case is different.
+
 ## v4.0.0 ##
 
   * Require Ruby 2.0.0+

data/LICENSE

@@ -1,30 +1,4 @@
-This product includes jquery 1.4.2, written by John Resig
-and distributed under an MIT license.
-See https://github.com/jquery/jquery/blob/1.4.2/MIT-LICENSE.txt
-
-    Copyright (c) 2010 John Resig, http://jquery.com/
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-All other components of this product are
+All components of this product are
 Copyright (c) 2008-2017 New Relic, Inc.  All rights reserved.
 
 Certain inventions disclosed in this file may be claimed within

data/README.md

@@ -3,21 +3,10 @@
 New Relic is a performance management system, developed by
 New Relic, Inc (http://www.newrelic.com).  It provides you with deep
 information about the performance of your Rails or Ruby
-application as it runs in production. The New Relic Ruby Agent is
-dual-purposed as a either a Gem or a Rails plugin, hosted on
-[github](https://github.com/newrelic/rpm/tree/master).
-
-The New Relic Ruby Agent runs in one of two modes:
-
-**Production Mode**
-Low overhead instrumentation that captures detailed information on
-your application running in production and transmits them to
-newrelic.com where you can monitor them in real time.
-
-**Developer Mode**
-A Rack middleware that maps `/newrelic` to an application for showing
-detailed performance metrics on a page by page basis.  Installed
-automatically in Rails applications.
+application as it runs in production and transmits them to
+newrelic.com where you can monitor them in real time. The New Relic
+Ruby Agent is dual-purposed as a either a Gem or a Rails plugin,
+hosted on [github](https://github.com/newrelic/rpm/tree/master).
 
 ## Supported Environments
 
@@ -90,9 +79,6 @@ Then make sure you set `RACK_ENV` to the environment corresponding to the
 configuration definitions in the newrelic.yml file; e.g., development,
 staging, production, etc.
 
-To use Developer Mode in Sinatra, add `NewRelic::Rack::DeveloperMode` to
-the middleware stack.  See the `config.ru` sample below.
-
 #### Other Environments
 
 You can use the Ruby Agent to monitor any Ruby application. Add:
@@ -118,45 +104,6 @@ frameworks.  You can find a list of community created intrumentation plugins
 (e.g. [newrelic-redis](https://github.com/evanphx/newrelic-redis)) in the
 [extends_newrelic_rpm project](https://github.com/newrelic/extends_newrelic_rpm).
 
-## Developer Mode
-
-When running the Developer Mode, the Ruby Agent will track the
-performance of every HTTP request serviced by your application, and
-store in memory this information for the last 100 HTTP transactions.
-
-To view this performance information, including detailed SQL statement
-analysis, open `/newrelic` in your web application.  For instance if
-you are running mongrel or thin on port 3000, enter the following into
-your browser:
-
-    http://localhost:3000/newrelic
-
-Developer Mode is only initialized if the `developer_mode` setting in
-the newrelic.yml file is set to true.  By default, it is turned off in
-all environments but `development`.
-
-#### Developer Mode in Rails
-
-Developer Mode is available automatically in Rails Applications based
-on Rails 2.3 and later.  No additional configuration is required. When
-your application starts and `developer_mode` is enabled, the Ruby
-Agent injects a middleware into your Rails middleware stack.
-
-For earlier versions of Rails that support Rack, you can use
-a `config.ru` as below.
-
-#### Developer Mode in Rack Applications
-
-Developer Mode is available for any Rack based application such as
-Sinatra by installing the NewRelic::Rack::DeveloperMode
-middleware. This middleware passes all requests that do not start with
-/newrelic.
-
-Here's an example entry for Developer Mode in a `config.ru` file:
-
-    require 'new_relic/rack/developer_mode'
-    use NewRelic::Rack::DeveloperMode
-
 ## Production Mode
 
 When your application runs in the production environment, the New

data/lib/new_relic/agent/agent.rb

@@ -377,7 +377,6 @@ module NewRelic
           def should_install_exit_handler?
             (
               Agent.config[:send_data_on_exit]  &&
-              !NewRelic::LanguageSupport.jruby? &&
               !sinatra_classic_app?
             )
           end
@@ -543,6 +542,9 @@ module NewRelic
           @transaction_event_recorder.drop_buffered_data
           @custom_event_aggregator.reset!
           @sql_sampler.reset!
+          if Agent.config[:clear_transaction_state_after_fork]
+            TransactionState.tl_clear
+          end
         end
 
         # Clear out state for any objects that we know lock from our parents
@@ -802,7 +804,8 @@ module NewRelic
               :environment   => @environment_report,
               :settings      => Agent.config.to_collector_hash,
               :high_security => Agent.config[:high_security],
-              :utilization   => UtilizationData.new.to_collector_hash
+              :utilization   => UtilizationData.new.to_collector_hash,
+              :identifier    => "ruby:#{local_host}:#{Agent.config.app_names.sort.join(',')}"
             }
           end
 

data/lib/new_relic/agent/attribute_filter.rb

@@ -68,7 +68,6 @@ module NewRelic
       DST_TRANSACTION_TRACER = 1 << 1
       DST_ERROR_COLLECTOR    = 1 << 2
       DST_BROWSER_MONITORING = 1 << 3
-      DST_DEVELOPER_MODE     = 1 << 4
 
       DST_ALL = 0xF
 

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

@@ -108,7 +108,7 @@ module NewRelic
         def self.agent_enabled
           Proc.new {
             NewRelic::Agent.config[:enabled] &&
-            (NewRelic::Agent.config[:developer_mode] || NewRelic::Agent.config[:monitor_mode]) &&
+            (NewRelic::Agent.config[:test_mode] || NewRelic::Agent.config[:monitor_mode]) &&
             NewRelic::Agent::Autostart.agent_should_start?
           }
         end
@@ -278,19 +278,12 @@ module NewRelic
           :allowed_from_server => false,
           :description => 'When <code>true</code>, the agent transmits data about your app to the New Relic <a href="https://docs.newrelic.com/docs/apm/new-relic-apm/getting-started/glossary#collector">collector</a>.'
         },
-        :developer_mode => {
-          :default => value_of(:developer),
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'When <code>true</code>, enables 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.'
-        },
-        :developer => {
+        :test_mode => {
           :default => false,
           :public => false,
           :type => Boolean,
           :allowed_from_server => false,
-          :description => 'Alternative method of enabling developer_mode.'
+          :description => 'Used in tests for agent to start up but not connect to collector. Formerly used <code>developer_mode</code> in test config for this purpose.'
         },
         :log_level => {
           :default => 'info',
@@ -433,13 +426,6 @@ module NewRelic
           :allowed_from_server => false,
           :description => 'Timeout for waiting on connect to complete before a rake task'
         },
-        :'profiling.available' => {
-          :default => DefaultSource.profiling_available,
-          :public => false,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'Determines if ruby-prof is available for developer mode profiling.'
-        },
         :apdex_t => {
           :default => 0.5,
           :public => true,
@@ -669,13 +655,6 @@ module NewRelic
           :allowed_from_server => false,
           :description => 'If <code>true</code>, disables view instrumentation.'
         },
-        :disable_backtrace_cleanup => {
-          :default => false,
-          :public => true,
-          :type => Boolean,
-          :allowed_from_server => false,
-          :description => 'If <code>true</code>, the agent won\'t remove <code>newrelic_rpm</code> from backtraces.'
-        },
         :disable_harvest_thread => {
           :default => false,
           :public => false,
@@ -895,6 +874,13 @@ module NewRelic
           :allowed_from_server => false,
           :description  => 'Disables installation of Redis instrumentation. Standard key to use is disable_redis.'
         },
+        :'message_tracer.segment_parameters.enabled' => {
+          :default      => true,
+          :public       => true,
+          :type         => Boolean,
+          :allowed_from_server => true,
+          :description  => 'If <code>true</code>, the agent will collect metadata about messages and attach them as segment parameters.'
+        },
         :'slow_sql.enabled' => {
           :default => value_of(:'transaction_tracer.enabled'),
           :public => true,
@@ -1251,6 +1237,14 @@ module NewRelic
           :allowed_from_server => false,
           :description  => 'If <code>true</code>, disables instrumentation for ActiveRecord 5.'
         },
+        :disable_bunny => {
+          :default      => false,
+          :public       => true,
+          :type         => Boolean,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description  => 'If <code>true</code>, disables instrumentation for the bunny gem.'
+        },
         :disable_curb => {
           :default      => false,
           :public       => true,
@@ -1315,14 +1309,6 @@ module NewRelic
           :allowed_from_server => false,
           :description  => 'If <code>true</code>, prevents the agent from hooking into Puma::Rack::URLMap to install middleware tracing.'
         },
-        :disable_rubyprof => {
-          :default      => false,
-          :public       => true,
-          :type         => Boolean,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description  => 'If <code>true</code>, the agent won\'t use RubyProf in developer mode.'
-        },
         :disable_typhoeus => {
           :default      => false,
           :public       => true,
@@ -1575,8 +1561,33 @@ module NewRelic
           :public      => true,
           :type        => Boolean,
           :allowed_from_server => false,
+          :dynamic_name => true,
           :description => 'If <code>true</code>, the agent automatically detects that it is running in an AWS environment.'
         },
+        :'utilization.detect_azure' => {
+          :default      => true,
+          :public       => true,
+          :type         => Boolean,
+          :allowed_from_server => false,
+          :dynamic_name => true,
+          :description  => 'If <code>true</code>, the agent automatically detects that it is running in an Azure environment.'
+        },
+        :'utilization.detect_gcp' => {
+          :default     => true,
+          :public      => true,
+          :type        => Boolean,
+          :allowed_from_server => false,
+          :dynamic_name => true,
+          :description => 'If <code>true</code>, the agent automatically detects that it is running in an Google Cloud Platform environment.'
+        },
+        :'utilization.detect_pcf' => {
+          :default     => true,
+          :public      => true,
+          :type        => Boolean,
+          :allowed_from_server => false,
+          :dynamic_name => true,
+          :description => 'If <code>true</code>, the agent automatically detects that it is running in a Pivotal Cloud Foundry environment.'
+        },
         :'utilization.detect_docker' => {
           :default     => true,
           :public      => true,
@@ -1621,6 +1632,13 @@ module NewRelic
           :type        => Boolean,
           :allowed_from_server => false,
           :description => 'If <code>false</code>, the agent will not add <code>database_name</code> parameter to transaction or slow sql traces.'
+        },
+        :'clear_transaction_state_after_fork' => {
+          :default     => false,
+          :public      => true,
+          :type        => Boolean,
+          :allowed_from_server => false,
+          :description => 'If <code>true</code>, the agent will clear <code>TransactionState</code> in <code>Agent.drop_buffered_data</code>.'
         }
       }.freeze
     end

data/lib/new_relic/agent/cross_app_monitor.rb

@@ -33,12 +33,12 @@ module NewRelic
           debug("Wiring up Cross Application Tracing to events after finished configuring")
 
         events.subscribe(:before_call) do |env| #THREAD_LOCAL_ACCESS
-          if should_process_request(env)
+          if id = decoded_id(env) and should_process_request?(id)
             state = NewRelic::Agent::TransactionState.tl_get
 
-            save_client_cross_app_id(state, env)
+            state.client_cross_app_id = id
             save_referring_transaction_info(state, env)
-            set_transaction_attributes(state)
+            CrossAppTracing.assign_intrinsic_transaction_attributes state
           end
         end
 
@@ -50,14 +50,6 @@ module NewRelic
 
       end
 
-      def save_client_cross_app_id(state, request_headers)
-        state.client_cross_app_id = decoded_id(request_headers)
-      end
-
-      def clear_client_cross_app_id(state)
-        state.client_cross_app_id = nil
-      end
-
       def save_referring_transaction_info(state, request_headers)
         txn_header = request_headers[NEWRELIC_TXN_HEADER_KEY] or return
         txn_info = deserialize_header(txn_header, NEWRELIC_TXN_HEADER)
@@ -93,30 +85,19 @@ module NewRelic
               content_length = content_length_from_request(request_headers)
 
               set_response_headers(state, response_headers, timings, content_length)
-              set_metrics(state.client_cross_app_id, timings)
             end
           end
-          clear_client_cross_app_id(state)
         end
       end
 
-      def should_process_request(request_headers)
-        return cross_app_enabled? && trusts?(request_headers)
+      def should_process_request? id
+        return cross_app_enabled? && CrossAppTracing.trusts?(id)
       end
 
       def cross_app_enabled?
         NewRelic::Agent::CrossAppTracing.cross_app_enabled?
       end
 
-      # Expects an ID of format "12#345", and will only accept that!
-      def trusts?(request)
-        id = decoded_id(request)
-        split_id = id.match(/(\d+)#\d+/)
-        return false if split_id.nil?
-
-        NewRelic::Agent.config[:trusted_account_ids].include?(split_id.captures.first.to_i)
-      end
-
       def set_response_headers(state, response_headers, timings, content_length)
         response_headers[NEWRELIC_APPDATA_HEADER] = build_payload(state, timings, content_length)
       end
@@ -133,26 +114,6 @@ module NewRelic
         payload = obfuscator.obfuscate(::JSON.dump(payload))
       end
 
-      def set_transaction_attributes(state)
-        # We expect to get the before call to set the id (if we have it) before
-        # this, and then write our custom parameter when the transaction starts
-        return unless txn = state.current_transaction
-
-        if state.client_cross_app_id
-          txn.attributes.add_intrinsic_attribute(:client_cross_process_id, state.client_cross_app_id)
-        end
-
-        referring_guid = client_referring_transaction_guid(state)
-        if referring_guid
-          txn.attributes.add_intrinsic_attribute(:referring_transaction_guid, referring_guid)
-        end
-      end
-
-      def set_metrics(id, timings)
-        metric_name = "ClientApplication/#{id}/all"
-        NewRelic::Agent.record_metric(metric_name, timings.app_time_in_seconds)
-      end
-
       def decoded_id(request)
         encoded_id = request[NEWRELIC_ID_HEADER_KEY]
         return "" if encoded_id.nil?