newrelic_rpm 6.7.0.359 → 6.15.0

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 6.7.0.359
+  version: 6.15.0
 platform: ruby
 authors:
-- Matthew Wear
-- Chris Pine
 - Rachel Klein
-- Justin Foote
+- Tanna McClure
+- Michael Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -19,26 +18,54 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: 12.3.3
+- !ruby/object:Gem::Dependency
+  name: rb-inotify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.10
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.10
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.8
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 4.7.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 4.7.5
 - !ruby/object:Gem::Dependency
@@ -47,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -75,14 +102,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +124,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.9
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.16.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.16.0
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: hometown
   requirement: !ruby/object:Gem::Requirement
@@ -115,23 +170,23 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 description: |
   New Relic is a performance management system, developed by New Relic,
   Inc (http://www.newrelic.com).  New Relic provides you with deep
   information about the performance of your web application as it runs
-  in production. The New Relic Ruby Agent is dual-purposed as a either a
+  in production. The New Relic Ruby agent is dual-purposed as a either a
   Gem or plugin, hosted on
-  https://github.com/newrelic/rpm/
+  https://github.com/newrelic/newrelic-ruby-agent/
 email: support@newrelic.com
 executables:
 - mongrel_rpm
@@ -148,7 +203,6 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - ".project"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -156,7 +210,9 @@ files:
 - Guardfile
 - LICENSE
 - README.md
+- ROADMAP.md
 - Rakefile
+- THIRD_PARTY_NOTICES.md
 - bin/mongrel_rpm
 - bin/newrelic
 - bin/newrelic_cmd
@@ -172,6 +228,7 @@ files:
 - lib/new_relic/agent/agent_logger.rb
 - lib/new_relic/agent/attribute_filter.rb
 - lib/new_relic/agent/attribute_processing.rb
+- lib/new_relic/agent/attributes.rb
 - lib/new_relic/agent/audit_logger.rb
 - lib/new_relic/agent/autostart.rb
 - lib/new_relic/agent/chained_call.rb
@@ -192,15 +249,13 @@ files:
 - lib/new_relic/agent/configuration/yaml_source.rb
 - lib/new_relic/agent/connect/request_builder.rb
 - lib/new_relic/agent/connect/response_handler.rb
-- lib/new_relic/agent/cross_app_monitor.rb
-- lib/new_relic/agent/cross_app_payload.rb
-- lib/new_relic/agent/cross_app_tracing.rb
 - lib/new_relic/agent/custom_event_aggregator.rb
 - lib/new_relic/agent/database.rb
 - lib/new_relic/agent/database/explain_plan_helpers.rb
 - lib/new_relic/agent/database/obfuscation_helpers.rb
 - lib/new_relic/agent/database/obfuscator.rb
 - lib/new_relic/agent/database/postgres_explain_obfuscator.rb
+- lib/new_relic/agent/database_adapter.rb
 - lib/new_relic/agent/datastores.rb
 - lib/new_relic/agent/datastores/metric_helper.rb
 - lib/new_relic/agent/datastores/mongo.rb
@@ -210,9 +265,15 @@ files:
 - lib/new_relic/agent/datastores/mongo/statement_formatter.rb
 - lib/new_relic/agent/datastores/redis.rb
 - lib/new_relic/agent/deprecator.rb
-- lib/new_relic/agent/distributed_trace_monitor.rb
-- lib/new_relic/agent/distributed_trace_payload.rb
 - lib/new_relic/agent/distributed_tracing.rb
+- lib/new_relic/agent/distributed_tracing/cross_app_payload.rb
+- lib/new_relic/agent/distributed_tracing/cross_app_tracing.rb
+- lib/new_relic/agent/distributed_tracing/distributed_trace_attributes.rb
+- lib/new_relic/agent/distributed_tracing/distributed_trace_metrics.rb
+- lib/new_relic/agent/distributed_tracing/distributed_trace_payload.rb
+- lib/new_relic/agent/distributed_tracing/distributed_trace_transport_type.rb
+- lib/new_relic/agent/distributed_tracing/trace_context.rb
+- lib/new_relic/agent/distributed_tracing/trace_context_payload.rb
 - lib/new_relic/agent/encoding_normalizer.rb
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/error_event_aggregator.rb
@@ -222,10 +283,11 @@ files:
 - lib/new_relic/agent/event_listener.rb
 - lib/new_relic/agent/event_loop.rb
 - lib/new_relic/agent/external.rb
+- lib/new_relic/agent/guid_generator.rb
 - lib/new_relic/agent/harvester.rb
 - lib/new_relic/agent/heap.rb
 - lib/new_relic/agent/hostname.rb
-- lib/new_relic/agent/http_clients/abstract_request.rb
+- lib/new_relic/agent/http_clients/abstract.rb
 - lib/new_relic/agent/http_clients/curb_wrappers.rb
 - lib/new_relic/agent/http_clients/excon_wrappers.rb
 - lib/new_relic/agent/http_clients/http_rb_wrappers.rb
@@ -233,7 +295,6 @@ files:
 - lib/new_relic/agent/http_clients/net_http_wrappers.rb
 - lib/new_relic/agent/http_clients/typhoeus_wrappers.rb
 - lib/new_relic/agent/http_clients/uri_util.rb
-- lib/new_relic/agent/inbound_request_monitor.rb
 - lib/new_relic/agent/instrumentation.rb
 - lib/new_relic/agent/instrumentation/action_cable_subscriber.rb
 - lib/new_relic/agent/instrumentation/action_controller_subscriber.rb
@@ -270,6 +331,7 @@ files:
 - lib/new_relic/agent/instrumentation/mongo.rb
 - lib/new_relic/agent/instrumentation/mongodb_command_subscriber.rb
 - lib/new_relic/agent/instrumentation/net.rb
+- lib/new_relic/agent/instrumentation/net_prepend.rb
 - lib/new_relic/agent/instrumentation/notifications_subscriber.rb
 - lib/new_relic/agent/instrumentation/padrino.rb
 - lib/new_relic/agent/instrumentation/passenger_instrumentation.rb
@@ -302,11 +364,17 @@ files:
 - lib/new_relic/agent/messaging.rb
 - lib/new_relic/agent/method_tracer.rb
 - lib/new_relic/agent/method_tracer_helpers.rb
+- lib/new_relic/agent/monitors.rb
+- lib/new_relic/agent/monitors/cross_app_monitor.rb
+- lib/new_relic/agent/monitors/distributed_tracing_monitor.rb
+- lib/new_relic/agent/monitors/inbound_request_monitor.rb
+- lib/new_relic/agent/monitors/synthetics_monitor.rb
 - lib/new_relic/agent/new_relic_service.rb
 - lib/new_relic/agent/new_relic_service/encoders.rb
 - lib/new_relic/agent/new_relic_service/json_marshaller.rb
 - lib/new_relic/agent/new_relic_service/marshaller.rb
 - lib/new_relic/agent/new_relic_service/security_policy_settings.rb
+- lib/new_relic/agent/noticible_error.rb
 - lib/new_relic/agent/null_logger.rb
 - lib/new_relic/agent/obfuscator.rb
 - lib/new_relic/agent/parameter_filtering.rb
@@ -335,7 +403,6 @@ files:
 - lib/new_relic/agent/stats_engine/stats_hash.rb
 - lib/new_relic/agent/supported_versions.rb
 - lib/new_relic/agent/synthetics_event_aggregator.rb
-- lib/new_relic/agent/synthetics_monitor.rb
 - lib/new_relic/agent/system_info.rb
 - lib/new_relic/agent/threading/agent_thread.rb
 - lib/new_relic/agent/threading/backtrace_node.rb
@@ -345,8 +412,8 @@ files:
 - lib/new_relic/agent/tracer.rb
 - lib/new_relic/agent/transaction.rb
 - lib/new_relic/agent/transaction/abstract_segment.rb
-- lib/new_relic/agent/transaction/attributes.rb
 - lib/new_relic/agent/transaction/datastore_segment.rb
+- lib/new_relic/agent/transaction/distributed_tracer.rb
 - lib/new_relic/agent/transaction/distributed_tracing.rb
 - lib/new_relic/agent/transaction/external_request_segment.rb
 - lib/new_relic/agent/transaction/message_broker_segment.rb
@@ -356,6 +423,7 @@ files:
 - lib/new_relic/agent/transaction/synthetics_sample_buffer.rb
 - lib/new_relic/agent/transaction/trace.rb
 - lib/new_relic/agent/transaction/trace_builder.rb
+- lib/new_relic/agent/transaction/trace_context.rb
 - lib/new_relic/agent/transaction/trace_node.rb
 - lib/new_relic/agent/transaction/tracing.rb
 - lib/new_relic/agent/transaction/transaction_sample_buffer.rb
@@ -378,12 +446,12 @@ files:
 - lib/new_relic/agent/vm/mri_vm.rb
 - lib/new_relic/agent/vm/snapshot.rb
 - lib/new_relic/agent/worker_loop.rb
-- lib/new_relic/build.rb
 - lib/new_relic/cli/command.rb
 - lib/new_relic/cli/commands/deployments.rb
 - lib/new_relic/cli/commands/install.rb
 - lib/new_relic/coerce.rb
 - lib/new_relic/collection_helper.rb
+- lib/new_relic/constants.rb
 - lib/new_relic/control.rb
 - lib/new_relic/control/class_methods.rb
 - lib/new_relic/control/frameworks.rb
@@ -407,7 +475,6 @@ files:
 - lib/new_relic/local_environment.rb
 - lib/new_relic/metric_data.rb
 - lib/new_relic/metric_spec.rb
-- lib/new_relic/metrics.rb
 - lib/new_relic/noticed_error.rb
 - lib/new_relic/rack.rb
 - lib/new_relic/rack/agent_hooks.rb
@@ -430,23 +497,19 @@ files:
 - lib/tasks/multiverse.rb
 - lib/tasks/newrelic.rb
 - lib/tasks/tests.rake
-- lib/tasks/versions.html.erb
-- lib/tasks/versions.postface.html
-- lib/tasks/versions.preface.html
-- lib/tasks/versions.rake
-- lib/tasks/versions.txt.erb
 - newrelic.yml
 - newrelic_rpm.gemspec
 - recipes/newrelic.rb
 - test/agent_helper.rb
 homepage: https://github.com/newrelic/rpm
 licenses:
-- New Relic
+- Apache-2.0
 metadata:
-  bug_tracker_uri: https://support.newrelic.com/
-  changelog_uri: https://github.com/newrelic/rpm/blob/master/CHANGELOG.md
+  bug_tracker_uri: https://github.com/newrelic/newrelic-ruby-agent/issues
+  changelog_uri: https://github.com/newrelic/newrelic-ruby-agent/blob/main/CHANGELOG.md
   documentation_uri: https://docs.newrelic.com/docs/agents/ruby-agent
-  source_code_uri: https://github.com/newrelic/rpm
+  source_code_uri: https://github.com/newrelic/newrelic-ruby-agent
+  homepage_uri: https://newrelic.com/ruby
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -462,7 +525,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: New Relic Ruby Agent

data/.travis.yml

@@ -1,175 +0,0 @@
-services:
-  - mysql
-  - redis-server
-  - memcached
-  - rabbitmq
-
-language: ruby
-
-dist: precise
-sudo: required
-jdk:
-  - oraclejdk8
-
-before_install:
-  # RUBY-2072 Prevent Travis setup failure before our test even starts
-  - jdk_switcher use oraclejdk8
-  - sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3.list
-  - gem --version
-  - ./test/script/before_install/update_rubygems.sh
-  - rvm @global do gem uninstall bundler --all --executables || true
-  - gem uninstall bundler --all --executables || true
-  - gem install bundler -v=1.17.3
-  - ./test/script/before_install/gemstash_mirror.sh
-  - bundle --version
-
-install: bundle install
-
-addons:
-  apt:
-    update: true
-    packages:
-      - openssl
-      - libssl-dev
-      - build-essential
-      - haveged
-
-before_script: ./test/script/before_script/install_mongodb.sh
-
-script: ./test/script/ci.sh
-
-branches:
-  only:
-    - master
-    - dev
-    - release
-
-rvm:
-  # Run slowest builds first to try and optimize overall cycle time.
-  - jruby-9.2.6.0
-  - 2.6.1
-  - 2.5.3
-  - 2.4.2
-  - 2.3.5
-  - 2.2.8
-  - 2.1.10
-  - 2.0.0-p648
-
-jdk:
-  - oraclejdk8
-
-env:
-  global:
-    - BUNDLE_PATH=/home/travis/bundle
-    - MONGODB=2.6.11
-    - JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xmx640m"
-    - JRUBY_OPTS="-Xcompile.invokedynamic=false -J-Djruby.compile.mode=OFF"
-    - RBXOPT="-Xcompiler.no_rbc -Xint"
-    - SERIALIZE=1
-    - TESTOPTS="-v"
-    - VERBOSE = 1
-  matrix:
-    - TYPE=UNIT ENVIRONMENT=rails30
-    - TYPE=UNIT ENVIRONMENT=rails31
-    - TYPE=UNIT ENVIRONMENT=rails32
-    - TYPE=UNIT ENVIRONMENT=rails40
-    - TYPE=UNIT ENVIRONMENT=rails41
-    - TYPE=UNIT ENVIRONMENT=rails42
-    - TYPE=UNIT ENVIRONMENT=rails50
-    - TYPE=UNIT ENVIRONMENT=rails51
-    - TYPE=UNIT ENVIRONMENT=rails60
-    - TYPE=UNIT ENVIRONMENT=norails
-    - TYPE=FUNCTIONAL GROUP=agent
-    - TYPE=FUNCTIONAL GROUP=api
-    - TYPE=FUNCTIONAL GROUP=background
-    - TYPE=FUNCTIONAL GROUP=database
-    - TYPE=FUNCTIONAL GROUP=httpclients
-    - TYPE=FUNCTIONAL GROUP=rails
-    - TYPE=FUNCTIONAL GROUP=serialization
-    - TYPE=FUNCTIONAL GROUP=sinatra
-    - TYPE=FUNCTIONAL GROUP=rest
-    - TYPE=FUNCTIONAL GROUP=background_2
-    - TYPE=NULLVERSE
-
-matrix:
-  allow_failures:
-    - rvm: jruby-9.2.6.0
-      env: TYPE=FUNCTIONAL GROUP=agent
-  fast_finish: true
-  exclude:
-    # Unsupported Rails/Ruby combinations
-    # 2.6
-    - rvm: 2.6.1
-      env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: 2.6.1
-      env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: 2.6.1
-      env: TYPE=UNIT ENVIRONMENT=rails32
-    - rvm: 2.6.1
-      env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: 2.6.1
-      env: TYPE=UNIT ENVIRONMENT=rails41
-
-    # 2.5
-    - rvm: 2.5.3
-      env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: 2.5.3
-      env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: 2.5.3
-      env: TYPE=UNIT ENVIRONMENT=rails32
-    - rvm: 2.5.3
-      env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: 2.5.3
-      env: TYPE=UNIT ENVIRONMENT=rails41
-
-    # 2.4
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails32
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails41
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails60
-
-    # 2.3
-    - rvm: 2.3.5
-      env: TYPE=UNIT ENVIRONMENT=rails60
-
-    # 2.2
-    - rvm: 2.2.8
-      env: TYPE=UNIT ENVIRONMENT=rails60
-
-    # 2.1
-    - rvm: 2.1.10
-      env: TYPE=UNIT ENVIRONMENT=rails50
-    - rvm: 2.1.10
-      env: TYPE=UNIT ENVIRONMENT=rails51
-    - rvm: 2.1.10
-      env: TYPE=UNIT ENVIRONMENT=rails60
-
-    # 2.0
-    - rvm: 2.0.0-p648
-      env: TYPE=UNIT ENVIRONMENT=rails50
-    - rvm: 2.0.0-p648
-      env: TYPE=UNIT ENVIRONMENT=rails51
-    - rvm: 2.0.0-p648
-      env: TYPE=UNIT ENVIRONMENT=rails60
-
-    # jruby 9.2.6.0 (Compatible with MRI 2.5)
-    - rvm: jruby-9.2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: jruby-9.2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: jruby-9.2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails32
-    - rvm: jruby-9.2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: jruby-9.2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails41
-    - rvm: jruby-9.2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails60

data/lib/new_relic/agent/cross_app_monitor.rb

@@ -1,110 +0,0 @@
-# encoding: utf-8
-# This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
-
-require 'digest'
-require 'json'
-
-require 'new_relic/agent/inbound_request_monitor'
-require 'new_relic/agent/tracer'
-require 'new_relic/agent/threading/agent_thread'
-require 'new_relic/agent/cross_app_payload'
-
-module NewRelic
-  module Agent
-    class CrossAppMonitor < InboundRequestMonitor
-
-      NEWRELIC_ID_HEADER      = 'X-NewRelic-ID'.freeze
-      NEWRELIC_TXN_HEADER     = 'X-NewRelic-Transaction'.freeze
-      NEWRELIC_APPDATA_HEADER = 'X-NewRelic-App-Data'.freeze
-
-      NEWRELIC_ID_HEADER_KEY    = 'HTTP_X_NEWRELIC_ID'.freeze
-      NEWRELIC_TXN_HEADER_KEY   = 'HTTP_X_NEWRELIC_TRANSACTION'.freeze
-      CONTENT_LENGTH_HEADER_KEY = 'HTTP_CONTENT_LENGTH'.freeze
-
-      def on_finished_configuring(events)
-        register_event_listeners(events)
-      end
-
-      def path_hash(txn_name, seed)
-        rotated    = ((seed << 1) | (seed >> 31)) & 0xffffffff
-        app_name   = NewRelic::Agent.config[:app_name].first
-        identifier = "#{app_name};#{txn_name}"
-        sprintf("%08x", rotated ^ hash_transaction_name(identifier))
-      end
-
-      private
-
-      # Expected sequence of events:
-      #   :before_call will save our cross application request id to the thread
-      #   :after_call will write our response headers/metrics and clean up the thread
-      def register_event_listeners(events)
-        NewRelic::Agent.logger.
-          debug("Wiring up Cross Application Tracing to events after finished configuring")
-
-        events.subscribe(:before_call) do |env| #THREAD_LOCAL_ACCESS
-          if id = decoded_id(env) and should_process_request?(id)
-            state = NewRelic::Agent::Tracer.state
-
-            if (transaction = state.current_transaction)
-              transaction_info = referring_transaction_info(state, env)
-
-              payload = CrossAppPayload.new(id, transaction, transaction_info)
-              transaction.cross_app_payload = payload
-            end
-
-            CrossAppTracing.assign_intrinsic_transaction_attributes state
-          end
-        end
-
-        events.subscribe(:after_call) do |env, (_status_code, headers, _body)| #THREAD_LOCAL_ACCESS
-          state = NewRelic::Agent::Tracer.state
-
-          insert_response_header(state, env, headers)
-        end
-      end
-
-      def referring_transaction_info(state, request_headers)
-        txn_header = request_headers[NEWRELIC_TXN_HEADER_KEY] or return
-        deserialize_header(txn_header, NEWRELIC_TXN_HEADER)
-      end
-
-      def insert_response_header(state, request_headers, response_headers)
-        txn = state.current_transaction
-        unless txn.nil? || txn.cross_app_payload.nil?
-          txn.freeze_name_and_execute_if_not_ignored do
-            content_length = content_length_from_request(request_headers)
-            set_response_headers(txn, response_headers, content_length)
-          end
-        end
-      end
-
-      def should_process_request? id
-        CrossAppTracing.cross_app_enabled? && CrossAppTracing.trusts?(id)
-      end
-
-      def set_response_headers(transaction, response_headers, content_length)
-        payload = obfuscator.obfuscate(
-          ::JSON.dump(
-            transaction.cross_app_payload.as_json_array(content_length)))
-
-        response_headers[NEWRELIC_APPDATA_HEADER] = payload
-      end
-
-      def decoded_id(request)
-        encoded_id = request[NEWRELIC_ID_HEADER_KEY]
-        return "" if encoded_id.nil? || encoded_id.empty?
-
-        obfuscator.deobfuscate(encoded_id)
-      end
-
-      def content_length_from_request(request)
-        request[CONTENT_LENGTH_HEADER_KEY] || -1
-      end
-
-      def hash_transaction_name(identifier)
-        Digest::MD5.digest(identifier).unpack("@12N").first & 0xffffffff
-      end
-    end
-  end
-end

data/lib/new_relic/agent/distributed_trace_monitor.rb

@@ -1,40 +0,0 @@
-# encoding: utf-8
-# This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
-
-require 'new_relic/agent/inbound_request_monitor'
-require 'new_relic/agent/cross_app_tracing'
-
-module NewRelic
-  module Agent
-    class DistributedTraceMonitor < InboundRequestMonitor
-      def on_finished_configuring(events)
-        return unless NewRelic::Agent.config[:'distributed_tracing.enabled']
-        events.subscribe(:before_call, &method(:on_before_call))
-      end
-
-      NEWRELIC_TRACE_KEY = 'HTTP_NEWRELIC'
-
-      def on_before_call(request)
-        return unless NewRelic::Agent.config[:'distributed_tracing.enabled']
-        return unless payload = request[NEWRELIC_TRACE_KEY]
-        return unless txn = Tracer.current_transaction
-
-        if txn.accept_distributed_trace_payload payload
-          txn.distributed_trace_payload.caller_transport_type = transport_type(request)
-        end
-      end
-
-      URL_SCHEMES = {
-        'http'  => 'HTTP'.freeze,
-        'https' => 'HTTPS'.freeze
-      }
-
-      RACK_URL_SCHEME = 'rack.url_scheme'.freeze
-
-      def transport_type(request)
-        URL_SCHEMES[request[RACK_URL_SCHEME]]
-      end
-    end
-  end
-end