newrelic_rpm 4.8.0.341 → 6.13.1

data/ROADMAP.md

@@ -0,0 +1,24 @@
+# Ruby Agent Roadmap
+
+## Product Vision
+The goal of the Ruby agent is to provide complete visibility into the health of your service. The agent provides metrics about the runtime health of your service and the process it runs in, and traces that show how specific requests are performing. It also provides information about the environment in which it is running, so you can identify issues with specific hosts, regions, deployments, and other facets. 
+
+New Relic is moving toward OpenTelemetry. OpenTelemetry is a unified standard for service instrumentation. You will soon see an updated version of the agent that uses the OpenTelemetry SDK and auto-instrumentation as its foundation. OpenTelemetry will include a broad set of high-quality community-contributed instrumentation and a powerful vendor-neutral API for adding your own instrumentation.
+
+
+## Roadmap
+### Description
+This roadmap project is broken down into the following sections:
+
+- **Now**:
+    - This section contains features that are currently in progress.
+- **Next**:
+    - This section contains work planned within the next three months. These features may still be deprioritized and moved to Future.
+- **Future**:
+    - This section is for ideas for future work that is aligned with the product vision and possible opportunities for community contribution. It contains a list of features that anyone can implement. No guarantees can be provided on if or when these features will be completed.
+     
+
+**The roadmap project is found [here](https://github.com/orgs/newrelic/projects/12)**
+
+#### Disclaimers
+> This roadmap is subject to change at any time. Future items should not be considered commitments.

data/Rakefile

@@ -113,6 +113,7 @@ namespace :cross_agent_tests do
   cross_agent_tests_upstream_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'cross_agent_tests'))
   cross_agent_tests_local_path    = File.expand_path(File.join(File.dirname(__FILE__), 'test', 'fixtures', 'cross_agent_tests'))
 
+  # Note: before you pull, make sure your local repo is on the correct, synced branch!
   desc 'Pull latest changes from cross_agent_tests repo'
   task :pull do
     puts "Updating embedded cross_agent_tests from #{cross_agent_tests_upstream_path}..."
@@ -136,3 +137,4 @@ task :console do
   ARGV.clear
   Pry.start
 end
+

data/THIRD_PARTY_NOTICES.md

@@ -0,0 +1,213 @@
+# Third Party Notices
+
+The New Relic Ruby Agent uses source code from third party libraries which carry
+their own copyright notices and license terms. These notices are provided
+below.
+
+In the event that a required notice is missing or incorrect, please notify us
+by e-mailing [open-source@newrelic.com](mailto:open-source@newrelic.com).
+
+For any licenses that require the disclosure of source
+code, the source code can be found at:
+[https://github.com/newrelic/newrelic-ruby-agent](https://github.com/newrelic/newrelic-ruby-agent).
+
+## Content
+
+* [symantec](#symantec)
+
+### symantec
+
+This product includes certificates from Symantec which are used under the
+following license (https://docs.broadcom.com/doc/root-certificate-license-agreement-en):
+
+```
+ROOT CERTIFICATE LICENSE AGREEMENT
+SYMANTEC CORPORATION AND/OR ITS AFFILIATES (“SYMANTEC”) IS WILLING TO PROVIDE THE
+ROOT CERTIFICATES TO YOU AS THE INDIVIDUAL, THE COMPANY, OR THE LEGAL ENTITY THAT
+WILL BE UTILIZING THE ROOT CERTIFICATES (REFERENCED BELOW AS “YOU” OR “YOUR”)
+ONLY ON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS OF THIS AGREEMENT
+(“AGREEMENT”). READ THE TERMS AND CONDITIONS OF THIS AGREEMENT CAREFULLY
+BEFORE USING THE ROOT CERTIFICATES. THIS IS A LEGAL AND ENFORCEABLE CONTRACT
+BETWEEN YOU AND SYMANTEC. BY USING THE ROOT CERTIFICATES, YOU AGREE TO THE
+TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO THESE TERMS AND
+CONDITIONS, MAKE NO FURTHER USE OF THE ROOT CERTIFICATES. UNLESS OTHERWISE
+DEFINED HEREIN, CAPITALIZED TERMS WILL HAVE THE MEANING GIVEN IN THE “DEFINITIONS”
+SECTION OF THIS AGREEMENT AND SUCH CAPITALIZED TERMS MAY BE USED IN THE
+SINGULAR OR IN THE PLURAL, AS THE CONTEXT REQUIRES.
+
+ROOT CERTIFICATE TERMS AND CONDITIONS
+1. DEFINITIONS.
+"Certificate" means an electronic file that, at least, states a name or identifies the issuing Certificate
+Authority, identifies the subscriber, contains the subscriber's public key, identifies the Certificate's
+operational period, contains a Certificate serial number, and contains a digital signature of the issuing
+Certificate Authority. 
+“Certificate Authority” or “CA” means a person or entity authorized to issue, suspend, or revoke
+Certificates.
+“Intermediate CA” means a CA Certificate signed by a Root Certificate Intermediate that issues
+Certificates either to end-entities or other Certificate Authorities, but not to both.
+"Products" means all versions of Your product or service with which the Root Certificates are incorporated
+(including successor products and services or any major or minor upgrades thereto).
+"Root Certificate" means a self-signed Certificate issued by a top-level Certificate Authority to itself, which
+includes such Certificate Authority's public key. The Root Certificates and Root Certificate files to be
+provided by Company to Customer pursuant to this Agreement are available for download at
+https://www.verisign.com/support/roots.html, https://www.thawte.com/roots/index.html or
+https://www.geotrust.com/resources/rootcertificates/index.html.
+2. LICENSE. During the term of this Agreement, Symantec grants You a royalty-free, non-exclusive, nontransferable license to (a) use the Root Certificate for the purposes of testing (without the right to modify);
+(b) make copies of Root Certificates only in order to embed and incorporate them, unmodified and in full,
+as roots in Your Products; (c) distribute the Root Certificates as embedded and incorporated in such
+Products; and (d) use the relevant logos and trademarks of Symantec in Your marketing materials,
+advertisements, product data sheets, product packaging and websites solely conjunction with the
+distribution of the Root Certificates in accordance with Symantec’s published guidelines for such usage.
+You shall not have the right to further distribute the Root Certificates other than as described herein
+without an additional license grant, in a separate writing, from Symantec.
+3. RESTRICTIONS. You may not: (a) modify or create any derivative works of Root Certificates; (b)
+assign, sublicense, sell, rent, or lease Symantec's root keys or Root Certificates; (c) use such Root
+Certificates except as expressly permitted under this Agreement; (d) remove or alter any trademark, logo,
+copyright, or other proprietary notices, legends, symbols, or labels provided in the Root Certificates; or (e)
+certify, or cause a third party to certify, the public key contained in the Root Certificates by issuing or
+creating a Certificate containing such public key.
+4. CUSTOMER’S OBLIGATIONS.
+4.1. During the term of this Agreement, You shall use commercially reasonable efforts regularly check the
+applicable Symantec URL for updates to the Root Certificates and update Root Certificates embedded
+into Your Products with the most currently available Root Certificates, unmodified and in full, or as a patch
+or update. If Symantec updates its Root Certificates,, You shall use commercially reasonable efforts to (i)
+discontinue all copying and use of the Root Certificates which have been replaced, and (ii) to use
+Symantec’s then-current Root Certificates. Any updates to the Root Certificates are incorporated into and
+subject to the terms of this Agreement.
+4.2. You shall appoint at least one (1) individual as the administrative contact designated to address any
+Root Certificate issues and shall provide the contact information for such individual to dl-tssroot@symantec.com.
+4.3 In the event You become aware of or suspect any event that diminishes the integrity of Symantec's
+data or public key system ("Compromise"), You shall immediately notify Symantec at dl-tss-
+root@symantec.com of such Compromise, and take reasonable steps to assist and cooperate with
+Symantec to remedy the Compromise.
+4.4 In the event that Symantec modifies these terms of use for the Root certificates for all end users,
+Symantec shall post the modified terms for the Agreement on the applicable URL and may post the
+modified terms on the Symantec corporate website. You shall be responsible for regularly checking the
+applicable URL for modifications to this Agreement. Such modifications shall be effective and binding on
+Customer within thirty (30) days of Symantec’s posting such modifications to its website. If you do not
+accept the modified Agreement, discontinue use of the Root Certificates and this Agreement will be
+deemed as terminated.
+5. CONFIDENTIALITY.
+5.1. Confidential Information. "Confidential Information" means the root private keys corresponding to the
+public key in a Root Certificate, and any confidential, trade secret, or other proprietary information
+disclosed by a party to the other party under this Agreement, except for Information that: (i) is public
+knowledge at the time of disclosure, (ii) was known by the receiving party before disclosure by the
+disclosing party, or becomes public knowledge or otherwise known to the receiving party after such
+disclosure, other than by breach of a confidentiality obligation, or (iii) is independently developed by the
+receiving party by persons without access to Confidential Information of the disclosing party.
+5.2. Protection of Confidential Information. The receiving party shall: (i) not disclose the Confidential
+information to any third party, (ii) not use the Confidential Information except for purposes of performing
+this Agreement, and (iii) take steps consistent with its protection of its own confidential and proprietary
+information (but in no event exercise less than reasonable care) to prevent unauthorized disclosure of the
+Confidential Information. Each party acknowledges that breach of this Section 5 may cause irreparable
+harm to the disclosing party entitling the disclosing party to injunctive relief, among other remedies.
+5.3. Mutual Cooperation. Each party will notify and cooperate with the other party in enforcing the
+disclosing party's rights if such party becomes aware of a threatened or actual violation of the
+confidentiality requirements of this Section 5. Each party shall have confidentiality agreements with its
+employees, agents or independent contractors sufficient in scope to fulfill its confidentiality obligations
+under this Agreement.
+6. INTELLECTUAL PROPERTY. You acknowledge that Symantec, including its wholly owned
+subsidiaries, retains all intellectual property rights and title (including any patent, copyright, trademark,
+trade secret, and other rights) in and to the Root Certificates, the public and private keys corresponding to
+such Root Certificates ("Symantec Intellectual Property"). This Agreement does not give You any
+intellectual property rights in the Symantec intellectual property except for the license granted in Section
+2. To the extent You use Symantec's trademarks or logos as permitted herein, You agree to comply with
+all usage requirements set forth in the then current version of Symantec's Logo and Trademark Usage
+Guide (http://www.symantec.com/about/profile/policies/trademarks.jsp) and any other guides and
+procedures of Symantec.
+7. NO WARRANTIES. THE ROOT CERTIFICATES, INCLUDING UPDATES, ARE PROVIDED "AS IS"
+WITHOUT ANY WARRANTY WHATSOEVER. SYMANTEC HEREBY DISCLAIMS ALL WARRANTIES,
+WHETHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING WITHOUT LIMITATION, ANY 
+IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+8. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY WILL
+SYMANTEC OR ITS LICENSORS BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY
+CONSEQUENTIAL, INDIRECT, SPECIAL, INCIDENTAL, OR EXEMPLARY DAMAGES, WHETHER
+FORESEEABLE OR UNFORESEEABLE, EVEN IF SUCH PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES. YOU WILL TAKE REASONABLE MEASURES TO INSURE THAT
+THE TERMS AND CONDITIONS SET FORTH IN THE PRECEDING SENTENCE OF THIS SECTION 8
+ARE INCORPORATED INTO ANY AGREEMENT BETWEEN YOU AND YOUR CUSTOMERS OR
+LICENSEES. SYMANTEC SHALL NOT BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY
+DAMAGES CAUSED BY YOUR OR A THIRD PARTY’S CONTINUED USE OF ANY OUTDATED
+ROOTS FOR WHICH AN UPDATED VERSION IS MADE AVAILABLE BY SYMANTEC. FURTHER,
+UNDER NO CIRCUMSTANCES WILL SYMANTEC'S LIABILITY FOR ANY ACTION OR CLAIM EXCEED
+USD$1,000, REGARDLESS OF WHETHER SUCH ACTION OR CLAIM IS BASED IN CONTRACT,
+TORT, STRICT LIABILITY, OR OTHERWISE.
+9. TERM AND TERMINATION.
+9.1. Term. This Agreement shall become effective as of the earlier of, Your first use of the Root
+Certificates, and shall remain in effect until the earlier of (i) Your discontinued use of the Root Certificates;
+(ii) termination by either party under the terms of Section 9.2, below; or (iii) Symantec’s notice to You that
+Symantec is no longer providing Root Certificates for use.
+9.2. Termination for Default/Insolvency. Either party shall be entitled to terminate this Agreement in the
+event of a failure by the other party to perform any of its material obligations under this Agreement if such
+breach is not cured within thirty (30) days after receipt of written notice thereof from the non-defaulting
+party or within forty-eight (48) hours after receipt of such written notice if a breach by You may
+compromise the security of the Symantec Trust Network or other system. This Agreement shall terminate
+upon the election of and notice from a party to the other if the other party is adjudged insolvent or
+bankrupt, or the institution of any proceedings by or against the other party seeking relief, reorganization,
+or arrangement under any laws relating to insolvency, or any assignment for the benefit of creditors, or
+the appointment of a receiver, liquidator, or trustee of any of the other party's property or assets, or the
+liquidation, dissolution, or winding up of the other party's business.
+9.3. Effect of Expiration or Termination. Upon expiration or termination of this Agreement, except for a
+breach by You, You may continue to distribute the current version of Your Products which incorporate the
+Root Certificates. Any updates or upgrades thereto may not include the Root Certificates and You shall
+stop making copies of Root Certificates, shall stop including Root Certificates in Your Products, and shall
+stop using Symantec’s logos and trademarks. The provisions of Sections 3, 4.3, 5, 6, 7, 8, 9.3, and 10
+shall survive termination of this Agreement.
+10. GENERAL.
+10.1. Governing Laws. This Agreement and any disputes relating to the services provided hereunder shall
+be governed and interpreted according to each of the following laws, respectively, without regard to its
+conflicts of law provisions: (a) the laws of the State of California, if You are located in North America or
+Latin America; or (b) the law of England, if You are located in Europe, Middle East or Africa; or (c) the 
+laws of Singapore, if You are located in Asia Pacific including Japan. The United Nations Convention on
+Contracts for the International Sale of Goods shall not apply to this Agreement.
+10.2. Binding Upon Successors; Assignment. This Agreement shall be binding upon, and inure to the
+benefit of, the successors, executors, heirs, representatives, administrators, and assigns of the parties
+hereto. Notwithstanding the foregoing, You may not assign Your rights or obligations under this
+Agreement without the prior written consent of Symantec. Any such purported assignment of this
+Agreement without obtaining written consent shall be void and of no effect.
+10.3. Severability; Enforcement; No Waiver. The unenforceability of any provision or provisions of this
+Agreement shall not impair the enforceability of any other part of this Agreement. If any provision of this
+Agreement shall be deemed invalid or unenforceable, in whole or in part, this Agreement shall be deemed
+amended to delete or modify, as necessary, the invalid or unenforceable provision to render it valid,
+enforceable, and, insofar as possible, consistent with the original intent of the parties. The failure of a
+party, at any time or from time to time, to require performance of any obligations of the other party
+hereunder shall not be deemed a waiver and shall not affect its right to enforce any provision of this
+Agreement at a subsequent time.
+10.4. Entire Agreement; Amendments; Waivers. This Agreement constitutes the entire understanding and
+agreement of the parties, whether written or oral, with respect to the subject matter hereof and supersede
+all prior and contemporaneous agreements or understandings between the parties. Any term or provision
+of this Agreement may be amended, and the observance of any term of this Agreement may be waived,
+only by writing signed by the parties to be bound thereby.
+10.5. Compliance with Law, Export Requirements and Foreign Reshipment Liability. Each party shall
+comply with all applicable federal, state and local laws and regulations in connection with its performance
+under this Agreement. Services, including documentation, may include controlled technology or technical
+data (collectively “Controlled Technology”) that is subject to the U.S. Export Administration Regulations
+(EAR), and diversion contrary to U.S. law is prohibited. You agree to comply with all relevant laws
+including the U.S. EAR and the laws of any country from which Controlled Technology is exported. All
+Controlled Technology is prohibited for export or re-export to Cuba, North Korea, Iran, Sudan and Syria
+and to any country or its nationals subject to relevant embargo or sanction or to any entity or person for
+which an export license is required per any relevant restricted party list, without first obtaining a license.
+Furthermore, You hereby agree that You will not use or allow use of Controlled Technology in connection
+with chemical, biological, or nuclear weapons, or missiles, drones or space launch vehicles capable of
+delivering such weapons. Symantec shall have the right to suspend performance of any of its obligations
+under this Agreement, without any prior notice being required and without any liability to Customer, if You
+fail to comply with this provision.
+10.6. Notices. You will make all notices, demands or requests to Symantec with respect to this Agreement
+in writing to the "Contact" address listed on the website from where you downloaded the Root Certificates,
+with a copy to: General Counsel – Legal Department, Symantec Corporation, 350 Ellis Street, Mountain
+View, California 94043, USA. Notices shall be effective on the date received (unless the notice specifies a
+later date) only if it is sent by a courier service that confirms delivery in writing or if sent by certified or
+registered mail, postage prepaid, return receipt requested. Symantec may post notices and updates
+regarding the Agreement or the Root Certificates at the URL provided to You for the Root Certificates.
+You shall be responsible for regularly checking the applicable URL for notices from Symantec regarding 
+the Agreement or the Root Certificates. No notices, demands, or requests to Symantec with respect to
+this Agreement may be delivered by electronic mail. You shall immediately notify Symantec of any legal
+notices served on You that might affect Symantec, and shall promptly forward the original or a copy of
+such notice to Symantec.
+10.7. Independent Parties. The relationship between You and Symantec is that of independent
+contractors. Neither party nor its employees, consultants, contractors, or agents are agents, employees,
+or joint venturers of the other party, nor do they have any authority to bind the other party by contract or
+otherwise to any obligation.
+Root Certificate License Agreement v3.0 (January 2014)
+```

data/bin/nrdebug

@@ -2,7 +2,7 @@
 
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'tempfile'
 require 'rbconfig'

data/config.dot

@@ -1,7 +1,6 @@
 digraph AgentEnabled {
   node[color=green]
   "[agent_enabled]"
-  "[developer_mode]"
   "[monitor_mode]"
   "[slow_sql.explain_threshold]"
   "[slow_sql.stack_trace_threshold]"
@@ -19,9 +18,9 @@ digraph AgentEnabled {
   "[error_collector.capture_source]"
   "[error_collector.enabled]"
   "[error_collector.ignore_errors]"
+  "[error_collector.max_backtrace_frames]"
   "[browser_monitoring.auto_instrument]"
   "[license_key]"
-  "[ssl]"
   "[verify_certificate]"
   "[api_host]"
   "[api_port]"
@@ -43,7 +42,7 @@ digraph AgentEnabled {
   "[dispatcher]"
   "[force_send]"
   "[textmate]"
-  "[post_size_limit]"
+  "[max_payload_size_in_bytes]"
   "[sync_startup]"
   "[send_data_on_exit]"
   "[high_security]"
@@ -164,14 +163,12 @@ digraph AgentEnabled {
   "Control#server_from_host" -> "[host]"
   "Control#server_from_host" -> "[port]"
   "Control#server_from_host" -> "Control#convert_to_ip_address"
-  "Control#http_connection" -> "[ssl]"
   "Control#http_connection" -> "[verify_certificate]"
   "Control#http_connection" -> "Control#proxy_server"
   "Control#set_log_level!" -> "[log_level]"
   "Control#log_path" -> "[log_file_path]"
   "Control#log_path" -> "Control#log_to_stdout?"
   "Control#log_to_stdout?" -> "[log_file_path]"
-  "Control#convert_to_ip_address" -> "[ssl]"
   "Control#convert_to_ip_address" -> "[verify_certificate]"
   "Control#server" -> "Control#server_from_host"
   "Control#setup_log" -> "Control#set_log_level!"
@@ -201,7 +198,6 @@ digraph AgentEnabled {
   "Agent#validate_settings" -> "[validate_token]"
   "Agent#log_error" -> "Control#server"
   "Agent#monitoring?" -> "[monitor_mode]"
-  "Agent#check_trasaction_sampler_status" -> "[developer_mode]"
   "Agent#check_sql_sampler_status" -> "[slow_sql.enabled]"
   "Agent#check_sql_sampler_status" -> "[slow_sql.record_sql]"
   "Agent#check_sql_sampler_status" -> "[transaction_tracer.enabled]"
@@ -216,7 +212,6 @@ digraph AgentEnabled {
   "MethodTracer#remove_method_tracer" -> "[agent_enabled]"
 
   "Rails#init_config" -> "[agent_enabled]"
-  "Rails#init_config" -> "[developer_mode]"
 
   "ErrorCollector#initialize" -> "[error_collector.enabled]"
   "ErrorCollector#initialize" -> "[error_collector.capture_source]"
@@ -226,7 +221,7 @@ digraph AgentEnabled {
   "NewRelicService#initialize" -> "[timeout]"
   "NewRelicService#initialize" -> "[license_key]"
   "NewRelicService#initialize" -> "Control#server"
-  "NewRelicService#check_post_size" -> "[post_size_limit]"
+  "NewRelicService#check_post_size" -> "[max_payload_size_in_bytes]"
   "NewRelicService#connect" -> "Control#server_from_host"
   "NewRelicService#send_request" -> "Control#http_connection"
 
@@ -240,10 +235,6 @@ digraph AgentEnabled {
   "TransactionSampler#configure!" -> "[transaction_tracer.explain_threshold]"
   "TransactionSampler#configure!" -> "[transaction_tracer.explain_enabled]"
   "TransactionSampler#configure!" -> "[transaction_tracer.transaction_threshold]"
-  "TransactionSampler#configure!" -> "[developer_mode]"
-  "TransactionSampler#notice_push_scope" -> "[developer_mode]"
-  "TransactionSampler#capture_segment_trace" -> "[developer_mode]"
-  "TransactionSampler#store_segment_for_developer_mode" -> "[developer_mode]"
 
   "NoticedError#initialize" -> "[high_security]"
 

data/init.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 # This is the initialization for the New Relic Ruby Agent when used as
 # a plugin

data/install.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 if __FILE__ == $0 || $0 =~ /script\/plugin/ || File.basename($0) == 'rake'
   $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), 'lib'))

data/lib/new_relic/agent.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'forwardable'
 
@@ -26,16 +26,15 @@ module NewRelic
 
     require 'new_relic/version'
     require 'new_relic/local_environment'
-    require 'new_relic/metrics'
     require 'new_relic/metric_spec'
     require 'new_relic/metric_data'
     require 'new_relic/noticed_error'
+    require 'new_relic/agent/noticible_error'
     require 'new_relic/supportability_helper'
 
     require 'new_relic/agent/encoding_normalizer'
     require 'new_relic/agent/stats'
     require 'new_relic/agent/chained_call'
-    require 'new_relic/agent/cross_app_monitor'
     require 'new_relic/agent/agent'
     require 'new_relic/agent/method_tracer'
     require 'new_relic/agent/worker_loop'
@@ -45,7 +44,6 @@ module NewRelic
     require 'new_relic/agent/sql_sampler'
     require 'new_relic/agent/commands/thread_profiler_session'
     require 'new_relic/agent/error_collector'
-    require 'new_relic/agent/busy_calculator'
     require 'new_relic/agent/sampler'
     require 'new_relic/agent/database'
     require 'new_relic/agent/datastores'
@@ -55,6 +53,10 @@ module NewRelic
     require 'new_relic/agent/http_clients/uri_util'
     require 'new_relic/agent/system_info'
     require 'new_relic/agent/external'
+    require 'new_relic/agent/deprecator'
+    require 'new_relic/agent/logging'
+    require 'new_relic/agent/distributed_tracing'
+    require 'new_relic/agent/attribute_processing'
 
     require 'new_relic/agent/instrumentation/controller_instrumentation'
 
@@ -76,7 +78,11 @@ module NewRelic
     class ForceDisconnectException < StandardError; end
 
     # An exception that forces an agent to restart.
-    class ForceRestartException < StandardError; end
+    class ForceRestartException < StandardError
+      def message
+        "#{super}, restarting."
+      end
+    end
 
     # Used to blow out of a periodic task without logging a an error, such as for routine
     # failures.
@@ -99,6 +105,8 @@ module NewRelic
 
     @agent = nil
     @logger = nil
+    @tracer_lock = Mutex.new
+    @tracer_queue = []
 
     # The singleton Agent instance.  Used internally.
     def agent #:nodoc:
@@ -110,6 +118,7 @@ module NewRelic
 
     def agent=(new_instance)#:nodoc:
       @agent = new_instance
+      add_deferred_method_tracers_now
     end
 
     alias instance agent #:nodoc:
@@ -124,6 +133,30 @@ module NewRelic
       @logger = log
     end
 
+    # A third-party class may call add_method_tracer before the agent
+    # is initialized; these methods enable us to defer these calls
+    # until we have started up and can process them.
+    #
+    def add_or_defer_method_tracer(receiver, method_name, metric_name_code, options)
+      @tracer_lock.synchronize do
+        if @agent
+          receiver.send(:_add_method_tracer_now, method_name, metric_name_code, options)
+        else
+          @tracer_queue << [receiver, method_name, metric_name_code, options]
+        end
+      end
+    end
+
+    def add_deferred_method_tracers_now
+      @tracer_lock.synchronize do
+        @tracer_queue.each do |receiver, method_name, metric_name_code, options|
+          receiver.send(:_add_method_tracer_now, method_name, metric_name_code, options)
+        end
+
+        @tracer_queue = []
+      end
+    end
+
     def config
       @config ||= Configuration::Manager.new
     end
@@ -179,11 +212,17 @@ module NewRelic
     # This method is safe to use from any thread.
     #
     # @api public
+
+    SUPPORTABILITY_INCREMENT_METRIC = 'Supportability/API/increment_metric'.freeze
+
     def increment_metric(metric_name, amount=1) #THREAD_LOCAL_ACCESS
       return unless agent
-
-      { 'Supportability/API/increment_metric' => 1,  metric_name => amount }.each do |metric, increment_amount|
-        agent.stats_engine.tl_record_unscoped_metrics(metric) {|stats| stats.increment_count(increment_amount) }
+      if amount == 1
+        metrics = [metric_name, SUPPORTABILITY_INCREMENT_METRIC]
+        agent.stats_engine.tl_record_unscoped_metrics(metrics) {|stats| stats.increment_count}
+      else
+        agent.stats_engine.tl_record_unscoped_metrics(metric_name) {|stats| stats.increment_count(amount)}
+        agent.stats_engine.tl_record_unscoped_metrics(SUPPORTABILITY_INCREMENT_METRIC) {|stats| stats.increment_count}
       end
     end
 
@@ -313,10 +352,9 @@ module NewRelic
     # @api public
     #
     def manual_start(options={})
-      record_api_supportability_metric(:manual_start)
-
       raise "Options must be a hash" unless Hash === options
       NewRelic::Control.instance.init_plugin({ :agent_enabled => true, :sync_startup => true }.merge(options))
+      record_api_supportability_metric(:manual_start)
     end
 
     # Register this method as a callback for processes that fork
@@ -454,7 +492,7 @@ module NewRelic
     # Yield to the block without collecting any metrics or traces in
     # any of the subsequent calls.  If executed recursively, will keep
     # track of the first entry point and turn on tracing again after
-    # leaving that block.  This uses the thread local TransactionState.
+    # leaving that block.  This uses the thread local Tracer::State.
     #
     # @api public
     #
@@ -477,16 +515,10 @@ module NewRelic
     # @api public
     #
     def disable_transaction_tracing
+      Deprecator.deprecate :disable_transaction_tracing,
+                           'disable_all_tracing or ignore_transaction'
       record_api_supportability_metric(:disable_transaction_tracing)
-
-      return yield unless agent
-
-      state = agent.set_record_tt(false)
-      begin
-        yield
-      ensure
-        agent.set_record_tt(state)
-      end
+      yield
     end
 
     # This method sets the state of sql recording in the transaction
@@ -517,19 +549,13 @@ module NewRelic
 
     # Check to see if we are capturing metrics currently on this thread.
     def tl_is_execution_traced?
-      NewRelic::Agent::TransactionState.tl_get.is_execution_traced?
-    end
-
-    # helper method to check the thread local to determine whether the
-    # transaction in progress is traced or not
-    def tl_is_transaction_traced?
-      NewRelic::Agent::TransactionState.tl_get.is_transaction_traced?
+      NewRelic::Agent::Tracer.state.is_execution_traced?
     end
 
     # helper method to check the thread local to determine whether sql
     # is being recorded or not
     def tl_is_sql_recorded?
-      NewRelic::Agent::TransactionState.tl_get.is_sql_recorded?
+      NewRelic::Agent::Tracer.state.is_sql_recorded?
     end
 
     # @!group Adding custom attributes to traces
@@ -542,6 +568,12 @@ module NewRelic
     # these custom attributes will also be present in the script injected into
     # the response body, making them available on Insights PageView events.
     #
+    #
+    # @param [Hash] params      A Hash of attributes to be attached to the transaction event.
+    #                           Keys should be strings or symbols, and values
+    #                           may be strings, symbols, numeric values or
+    #                           booleans.
+    #
     # @api public
     #
     def add_custom_attributes(params) #THREAD_LOCAL_ACCESS
@@ -550,11 +582,43 @@ module NewRelic
       if params.is_a? Hash
         txn = Transaction.tl_current
         txn.add_custom_attributes(params) if txn
+
+        segment = ::NewRelic::Agent::Tracer.current_segment
+        if segment
+          # Make sure not to override existing segment-level custom attributes
+          segment_custom_keys = segment.attributes.custom_attributes.keys.map(&:to_sym)
+          segment.add_custom_attributes(params.reject { |k, _v| segment_custom_keys.include?(k.to_sym) })
+        end
       else
         ::NewRelic::Agent.logger.warn("Bad argument passed to #add_custom_attributes. Expected Hash but got #{params.class}")
       end
     end
 
+    # Add custom attributes to the span event for the current span. Attributes will be visible on spans in the
+    # New Relic Distributed Tracing UI and on span events in New Relic Insights.
+    #
+    # Custom attributes will not be transmitted when +high_security+ setting is enabled or
+    # +custom_attributes+ setting is disabled.
+    #
+    # @param [Hash] params      A Hash of attributes to be attached to the span event.
+    #                           Keys should be strings or symbols, and values
+    #                           may be strings, symbols, numeric values or
+    #                           booleans.
+    #
+    # @see https://docs.newrelic.com/docs/using-new-relic/welcome-new-relic/get-started/glossary#span
+    # @api public
+    def add_custom_span_attributes params
+      record_api_supportability_metric :add_custom_span_attributes
+
+      if params.is_a? Hash
+        if segment = NewRelic::Agent::Tracer.current_segment
+          segment.add_custom_attributes params
+        end
+      else
+        ::NewRelic::Agent.logger.warn "Bad argument passed to #add_custom_span_attributes. Expected Hash but got #{params.class}"
+      end
+    end
+
     # @!endgroup
 
     # @!group Transaction naming
@@ -563,7 +627,9 @@ module NewRelic
     # apply a reasonable default based on framework routing, but in
     # cases where this is insufficient, this can be used to manually
     # control the name of the transaction.
-    # The category of transaction can be specified via the +:category+ option:
+    #
+    # The category of transaction can be specified via the +:category+ option.
+    # The following are the only valid categories:
     #
     # * <tt>:category => :controller</tt> indicates that this is a
     #   controller action and will appear with all the other actions.
@@ -613,8 +679,8 @@ module NewRelic
     # @param [String] method the name of the finder method or other method to
     # identify the operation with.
     #
-    def with_database_metric_name(model, method = nil, product = nil, &block) #THREAD_LOCAL_ACCESS
-      if txn = Transaction.tl_current
+    def with_database_metric_name(model, method = nil, product = nil, &block)
+      if txn = Tracer.current_transaction
         txn.with_database_metric_name(model, method, product, &block)
       else
         yield
@@ -635,6 +701,54 @@ module NewRelic
       NewRelic::Agent.logger.debug "Ignoring exception during %p event notification" % [event_type]
     end
 
+    # @!group Trace and Entity metadata
+
+    TRACE_ID_KEY = 'trace.id'.freeze
+    SPAN_ID_KEY = 'span.id'.freeze
+    ENTITY_NAME_KEY = 'entity.name'.freeze
+    ENTITY_TYPE_KEY = 'entity.type'.freeze
+    ENTITY_GUID_KEY = 'entity.guid'.freeze
+    HOSTNAME_KEY = 'hostname'.freeze
+
+    ENTITY_TYPE = 'SERVICE'.freeze
+
+    # Returns a new hash containing trace and entity metadata that can be used
+    # to relate data to a trace or to an entity in APM.
+    #
+    # This hash includes:
+    # * trace.id    - The current trace id, if there is a current trace id. This
+    #   value may be omitted.
+    # * span.id     - The current span id, if there is a current span.  This
+    #   value may be omitted.
+    # * entity.name - The name of the current application. This is read from
+    #   the +app_name+ key in your config.  If there are multiple application
+    #   names, the first one is used.
+    # * entity.type - The entity type is hardcoded to the string +'SERVICE'+.
+    # * entity.guid - The guid of the current entity.
+    # * hostname    - The fully qualified hostname.
+    #
+    # @api public
+    def linking_metadata
+      metadata = Hash.new
+      metadata[ENTITY_NAME_KEY] = config[:app_name][0]
+      metadata[ENTITY_TYPE_KEY] = ENTITY_TYPE
+      metadata[HOSTNAME_KEY] = Hostname.get
+
+      if entity_guid = config[:entity_guid]
+        metadata[ENTITY_GUID_KEY] = entity_guid
+      end
+
+      if trace_id = Tracer.current_trace_id
+        metadata[TRACE_ID_KEY] = trace_id
+      end
+      if span_id = Tracer.current_span_id
+        metadata[SPAN_ID_KEY] = span_id
+      end
+      metadata
+    end
+
+    #@!endgroup
+
     # @!group Manual browser monitoring configuration
 
     # This method returns a string suitable for inclusion in a page - known as