newrelic_rpm 6.1.0.352 → 6.6.0.358

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73929ba01fea0db2f54b9977a41dfc7b710d51f38b9d07a8f0d96e8525a8574a
-  data.tar.gz: cb28508e22221fe2c0869a247ee9796ea9a07f595ca51679eee9fd5b75027d1a
+  metadata.gz: 6d39324de06656b928892edc72296e459eb2737929e20f054514c2ddc980bfb0
+  data.tar.gz: 3752b1d5dbcd79b38a808460c68141926ae627f0c50ec8cc6ded103285719844
 SHA512:
-  metadata.gz: 0e8c015d61f300f5460a8c2a4e38d8baf74917529d4f17bc8218114e2a71b6b8cb9cdc520b68e301f2a6733b8026f6bf4815709374ba6c7de6fc60ec622d9775
-  data.tar.gz: d61094c98597fe88fb0d947b9ab6ea68f450e89dc592ab29116a000f06ca2acea7958a7d130619eecad1e94b908fd201e811cd6a27e5936db65876dcaaa489cf
+  metadata.gz: 6f277cc9660dde4ef818de176ad156202ad1993594416882e678b31786386f547b200a96444be1a84bfa53e8385700f07b837d3c500a1e8529d2e4c5d9bbf3ab
+  data.tar.gz: 258bd06b3feaf43c29e8007a6d97003d2d7879b719fc818ba1a374a2167f336f1b4b4352b31d938af24afb0c917751649e62eddaaab41a7955ef55e10f56e84d

data/.gitignore

@@ -25,4 +25,5 @@ lib/new_relic/build.rb
 .bundle
 .yardoc
 artifacts/
+test/performance/log/
 test/performance/script/log/

data/.travis.yml

@@ -10,15 +10,16 @@ sudo: required
 
 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
-  - gem uninstall bundler -a -x
+  - rvm @global do gem uninstall bundler --all --executables || true
   - gem install bundler -v=1.17.3
   - ./test/script/before_install/gemstash_mirror.sh
-  - bundle _1.17.3_ --version
+  - bundle --version
 
-install: bundle _1.17.3_ install
+install: bundle install
 
 addons:
   apt:
@@ -39,16 +40,11 @@ branches:
     - dev
     - release
 
-notifications:
-  webhooks: http://notifitron.herokuapp.com/
-  on_success: always
-  on_failure: always
-
 rvm:
   # Run slowest builds first to try and optimize overall cycle time.
-  - jruby-9.1.13.0
-  - 2.6.0
-  - 2.5.0
+  - jruby-9.2.6.0
+  - 2.6.1
+  - 2.5.3
   - 2.4.2
   - 2.3.5
   - 2.2.8
@@ -66,11 +62,6 @@ env:
     - TESTOPTS="-v"
     - VERBOSE = 1
   matrix:
-    # RUBY-1668 rails21, rails22, and rails23 are all excluded below
-    - TYPE=UNIT ENVIRONMENT=rails21
-    - TYPE=UNIT ENVIRONMENT=rails22
-    - TYPE=UNIT ENVIRONMENT=rails23
-
     - TYPE=UNIT ENVIRONMENT=rails30
     - TYPE=UNIT ENVIRONMENT=rails31
     - TYPE=UNIT ENVIRONMENT=rails32
@@ -79,6 +70,7 @@ env:
     - 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
@@ -97,48 +89,30 @@ matrix:
   exclude:
     # Unsupported Rails/Ruby combinations
     # 2.6
-    - rvm: 2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.6.0
-      env: TYPE=UNIT ENVIRONMENT=rails23
-    - rvm: 2.6.0
+    - rvm: 2.6.1
       env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: 2.6.0
+    - rvm: 2.6.1
       env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: 2.6.0
+    - rvm: 2.6.1
       env: TYPE=UNIT ENVIRONMENT=rails32
-    - rvm: 2.6.0
+    - rvm: 2.6.1
       env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: 2.6.0
+    - rvm: 2.6.1
       env: TYPE=UNIT ENVIRONMENT=rails41
 
     # 2.5
-    - rvm: 2.5.0
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.5.0
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.5.0
-      env: TYPE=UNIT ENVIRONMENT=rails23
-    - rvm: 2.5.0
+    - rvm: 2.5.3
       env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: 2.5.0
+    - rvm: 2.5.3
       env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: 2.5.0
+    - rvm: 2.5.3
       env: TYPE=UNIT ENVIRONMENT=rails32
-    - rvm: 2.5.0
+    - rvm: 2.5.3
       env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: 2.5.0
+    - rvm: 2.5.3
       env: TYPE=UNIT ENVIRONMENT=rails41
 
     # 2.4
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.4.2
-      env: TYPE=UNIT ENVIRONMENT=rails23
     - rvm: 2.4.2
       env: TYPE=UNIT ENVIRONMENT=rails30
     - rvm: 2.4.2
@@ -149,79 +123,43 @@ matrix:
       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=rails21
-    - rvm: 2.3.5
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.3.5
-      env: TYPE=UNIT ENVIRONMENT=rails23
+      env: TYPE=UNIT ENVIRONMENT=rails60
 
     # 2.2
     - rvm: 2.2.8
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.2.8
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.2.8
-      env: TYPE=UNIT ENVIRONMENT=rails23
+      env: TYPE=UNIT ENVIRONMENT=rails60
 
     # 2.1
-    - rvm: 2.1.10
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.1.10
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.1.10
-      env: TYPE=UNIT ENVIRONMENT=rails23
     - 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=rails21
-    - rvm: 2.0.0-p648
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.0.0-p648
-      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
+    - rvm: 2.0.0-p648
+      env: TYPE=UNIT ENVIRONMENT=rails60
 
-    # jruby 9.0
-    - rvm: jruby-9.1.13.0
-      env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: jruby-9.1.13.0
-      env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: jruby-9.1.13.0
-      env: TYPE=UNIT ENVIRONMENT=rails23
-    - rvm: jruby-9.1.13.0
+    # jruby 9.2.6.0 (Compatible with MRI 2.5)
+    - rvm: jruby-9.2.6.0
       env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.2.6.0
       env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.2.6.0
       env: TYPE=UNIT ENVIRONMENT=rails32
-
-  # Travis (and only Travis) has been throwing difficult-to-reproduce
-  # errors in various JRuby tests.  These appeared after a build image
-  # update, and they seem to be unrelated to any agent code changes.
-  # So, we'll allow these specific test runs to fail while we track
-  # the issue (RUBY-1869).
-  #
-  allow_failures:
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.2.6.0
       env: TYPE=UNIT ENVIRONMENT=rails40
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.2.6.0
       env: TYPE=UNIT ENVIRONMENT=rails41
-    - rvm: jruby-9.1.13.0
-      env: TYPE=UNIT ENVIRONMENT=rails42
-    - rvm: jruby-9.1.13.0
-      env: TYPE=UNIT ENVIRONMENT=rails50
-    - rvm: jruby-9.1.13.0
-      env: TYPE=UNIT ENVIRONMENT=rails51
-    - rvm: jruby-9.1.13.0
-      env: TYPE=UNIT ENVIRONMENT=norails
-    - rvm: jruby-9.1.13.0
-      env: TYPE=FUNCTIONAL GROUP=background_2
+    - rvm: jruby-9.2.6.0
+      env: TYPE=UNIT ENVIRONMENT=rails60

data/CHANGELOG.md

@@ -1,5 +1,144 @@
 # New Relic Ruby Agent Release Notes #
 
+## v6.6.0
+
+  * **Bugfix for ActionCable Instrumentation**
+
+    Previous versions of the agent sometimes caused application crashes with some versions
+    of ActionCable.  The application would exit quickly after startup with the error:
+    `uninitialized constant ActionCable::Engine`.
+
+    Version 6.6.0 of the agent no longer crashes in this way.
+
+
+  * **Handling of disabling Error Collection**
+
+    When the agent first starts, it begins collecting Error Events and Traces before
+    fetching configuration from New Relic.  In previous versions of the agent, those
+    events or traces would be sent to New Relic, even if _Error Collection_ is disabled in
+    the application's server-side configuration.
+
+    Version 6.6.0 of the agent drops all collected Error Events and Traces if the
+    configuration from the server disables _Error Collection_.
+
+## v6.5.0
+
+* **Change to default setting for ActiveRecord connection resolution**
+
+  Due to incompatibilities between the faster ActiveRecord connection resolution
+  released in v6.3.0 of the agent and other gems which patch ActiveRecord,
+  `backport_fast_active_record_connection_lookup` will now be set to `false` by default.
+  Because it results in a significant performance improvement, we recommend customers
+  whose environments include ActiveRecord change this setting to `true`
+  _unless_ they are using other gems which measure ActiveRecord performance, which may
+  lose functionality when combined with this setting. If unsure whether to enable
+  `backport_fast_active_record_connection_lookup`, we recommend enabling it in a
+  development environment to make sure other gems which patch ActiveRecord are still
+  working as expected.
+
+* **Bugfix for ActiveStorage instrumentation error**
+
+  Version 6.4.0 of the agent introduced a bug that interfered with ActiveStorage
+  callbacks, resulting in the agent being unable to instrument ActiveStorage operations.
+  ActiveStorage segments are now correctly recorded.
+
+* **Bugfix for ActiveRecord 4.1 and 4.2 exception logging**
+
+  Version 6.3.0 of the agent introduced a bug that prevented ActiveRecord versions 4.1
+  and 4.2 from logging exceptions that occurred within a database transaction.  This
+  version of the agent restores the exception logging functionality from previous agent
+  versions.
+  Thanks to Oleksiy Kovyrin for the contribution!
+
+## v6.4.0
+
+* **Custom Metadata Collection**
+
+  The agent now collects environment variables prefixed by `NEW_RELIC_METADATA_`.  These
+  may be added to transaction events to provide context between your Kubernetes cluster
+  and your services.  For details on the behavior, see
+  [this blog post](https://blog.newrelic.com/engineering/monitoring-application-performance-in-kubernetes/).
+
+* **Bugfix for faster ActiveRecord connection resolution**
+
+  Version 6.3.0 of the agent backported the faster ActiveRecord connection resolution
+  from Rails 6.0 to previous versions, but the implementation caused certain other gems
+  which measured ActiveRecord performance to stop working. This version of the agent
+  changes the implementation of this performance improvement so no such conflicts occur.
+
+* **Bugfix for Grape instrumentation error**
+
+  Previous versions of the agent would fail to install Grape instrumentation in Grape
+  versions 1.2.0 and up if the API being instrumented subclassed `Grape::API::Instance`
+  rather than `Grape::API`.  A warning would also print to the newrelic_agent log:
+  ```
+  WARN : Error in Grape instrumentation
+  WARN : NoMethodError: undefined method `name' for nil:NilClass
+  ```
+
+  This version of the agent successfully installs instrumentation for subclasses
+  of `Grape::API::Instance`, and these log messages should no longer appear.
+
+* **Bugfix for streaming responses**
+
+  Previous versions of the agent would attempt to insert JavaScript instrumentation into
+  any streaming response that did not make use of `ActionController::Live`.  This resulted
+  in an empty, non-streamed response being sent to the client.
+
+  This version of the agent will not attempt to insert JavaScript instrumentation into
+  a response which includes the header `Transfer-Encoding=chunked`, which indicates a
+  streaming response.
+
+  This should exclude JavaScript instrumentation for all streamed responses.  To include
+  this instrumentation manually, see
+  [Manually instrument via agent API](https://docs.newrelic.com/docs/agents/ruby-agent/features/new-relic-browser-ruby-agent#manual_instrumentation)
+  in our documentation.
+
+## v6.3.0
+
+  * **Official Rails 6.0 support**
+
+    This version of the agent has been verified against the Rails 6.0.0 release.
+
+    As ActiveRecord 4, 5, and 6 use the same New Relic instrumentation, the
+    `disable_active_record_4` and `disable_active_record_5` settings in NewRelic.yml are being
+    deprecated in favor of the new `disable_active_record_notifications`.  This new
+    setting will affect the instrumentation of ActiveRecord 4, 5, and 6. The deprecated settings
+    will be removed in a future release.
+
+  * **Bugfix for `newrelic deployments` script**
+
+    For applications housed in the EU, the `newrelic deployments` script included with previous
+    versions of the agent would fail with the following message: `Deployment not recorded:
+    Application does not exist.` This is because the script would attempt to send the deployment
+    notification to the US region. The deployment script now sends deployments to the correct region.
+
+  * **Faster ActiveRecord connection resolution**
+
+    This version of the agent uses the faster ActiveRecord connection resolution that Rails 6.0 uses, even on previous versions of Rails.
+    Thanks to Callum Jones for the contribution!
+
+  * **Support non-ascii characters in hostnames**
+
+    Previous versions of the agent would frequently log warnings like: `log writing failed.  "\xE2" from ASCII-8BIT to UTF-8` if the hostname contained a non-ascii character.  This version of the agent will no longer log these warnings.
+    Thanks to Rafael Petry for the contribution!
+
+## v6.2.0
+
+  * Bugfix for superfluous `Empty JSON response` error messages
+
+    Version 6.1.0 of the agent frequently logged error messages about an empty
+    JSON response, when no error had occurred.  These logs no longer appear.
+
+  * Bugfix for `Unable to calculate elapsed transaction time` warning messages
+
+    Ruby Agent versions 5.4 through 6.1, when running in jruby without
+    ObjectSpace enabled, would occasionally log a warning indicating that the
+    agent was unable to calculate the elapsed transaction time.  When this log
+    statement appeared, the affected transactions would not be included in the
+    data displayed on the capacity analysis page.  These transactions are now
+    correctly recorded.
+
 ## v6.1.0
 
    * Performance monitoring on Kubernetes

data/lib/new_relic/agent/agent.rb

@@ -30,6 +30,8 @@ require 'new_relic/agent/utilization_data'
 require 'new_relic/environment_report'
 require 'new_relic/agent/attribute_filter'
 require 'new_relic/agent/adaptive_sampler'
+require 'new_relic/agent/connect/request_builder'
+require 'new_relic/agent/connect/response_handler'
 
 module NewRelic
   module Agent
@@ -57,7 +59,7 @@ module NewRelic
         @cross_app_monitor         = NewRelic::Agent::CrossAppMonitor.new(@events)
         @distributed_trace_monitor = NewRelic::Agent::DistributedTraceMonitor.new(@events)
         @synthetics_monitor        = NewRelic::Agent::SyntheticsMonitor.new(@events)
-        @error_collector           = NewRelic::Agent::ErrorCollector.new
+        @error_collector           = NewRelic::Agent::ErrorCollector.new @events
         @transaction_rules         = NewRelic::Agent::RulesEngine.new
         @harvest_samplers          = NewRelic::Agent::SamplerCollection.new(@events)
         @monotonic_gc_profiler     = NewRelic::Agent::VM::MonotonicGCProfiler.new
@@ -68,13 +70,12 @@ module NewRelic
         @harvester       = NewRelic::Agent::Harvester.new(@events)
         @after_fork_lock = Mutex.new
 
-        @transaction_event_recorder = NewRelic::Agent::TransactionEventRecorder.new
-        @custom_event_aggregator    = NewRelic::Agent::CustomEventAggregator.new
-        @span_event_aggregator      = NewRelic::Agent::SpanEventAggregator.new
+        @transaction_event_recorder = NewRelic::Agent::TransactionEventRecorder.new @events
+        @custom_event_aggregator    = NewRelic::Agent::CustomEventAggregator.new @events
+        @span_event_aggregator      = NewRelic::Agent::SpanEventAggregator.new @events
 
         @connect_state      = :pending
         @connect_attempts   = 0
-        @environment_report = nil
         @waited_on_connect  = nil
         @connected_pid      = nil
 
@@ -87,7 +88,7 @@ module NewRelic
       def setup_attribute_filter
         refresh_attribute_filter
 
-        @events.subscribe(:finished_configuring) do
+        @events.subscribe(:initial_configuration_complete) do
           refresh_attribute_filter
         end
       end
@@ -136,7 +137,7 @@ module NewRelic
         # Transaction and metric renaming rules as provided by the
         # collector on connect.  The former are applied during txns,
         # the latter during harvest.
-        attr_reader :transaction_rules
+        attr_accessor :transaction_rules
         # Responsbile for restarting the harvest thread
         attr_reader :harvester
         # GC::Profiler.total_time is not monotonic so we wrap it.
@@ -155,6 +156,10 @@ module NewRelic
           @transaction_event_recorder.synthetics_event_aggregator
         end
 
+        def agent_id=(agent_id)
+          @service.agent_id = agent_id
+        end
+
         # This method should be called in a forked process after a fork.
         # It assumes the parent process initialized the agent, but does
         # not assume the agent started.
@@ -476,7 +481,6 @@ module NewRelic
             @harvester.mark_started
 
             unless in_resque_child_process?
-              generate_environment_report
               install_exit_handler
               @harvest_samplers.load_samplers unless Agent.config[:disable_samplers]
             end
@@ -527,7 +531,7 @@ module NewRelic
           check_config_and_start_agent
           log_version_and_pid
 
-          events.subscribe(:finished_configuring) do
+          events.subscribe(:initial_configuration_complete) do
             log_ignore_url_regexes
           end
         end
@@ -571,24 +575,6 @@ module NewRelic
             EventLoop.new
           end
 
-          # Never allow any data type to be reported more frequently than once
-          # per second.
-          MIN_ALLOWED_REPORT_PERIOD = 1.0
-
-          def report_period_for(method)
-            config_key = "data_report_periods.#{method}".to_sym
-            period = Agent.config[config_key]
-            if !period
-              period = Agent.config[:data_report_period]
-              ::NewRelic::Agent.logger.warn("Could not find configured period for #{method}, falling back to data_report_period (#{period} s)")
-            end
-            if period < MIN_ALLOWED_REPORT_PERIOD
-              ::NewRelic::Agent.logger.warn("Configured #{config_key} was #{period}, but minimum allowed is #{MIN_ALLOWED_REPORT_PERIOD}, using #{MIN_ALLOWED_REPORT_PERIOD}.")
-              period = MIN_ALLOWED_REPORT_PERIOD
-            end
-            period
-          end
-
           LOG_ONCE_KEYS_RESET_PERIOD = 60.0
 
           def create_and_run_event_loop
@@ -603,7 +589,7 @@ module NewRelic
               ::NewRelic::Agent.logger.clear_already_logged
             end
             @event_loop.fire_every(Agent.config[:data_report_period],       :report_data)
-            @event_loop.fire_every(report_period_for(:analytic_event_data), :report_event_data)
+            @event_loop.fire_every(Agent.config[:event_report_period],      :report_event_data)
             @event_loop.fire_every(LOG_ONCE_KEYS_RESET_PERIOD,              :reset_log_once_keys)
 
             @event_loop.run
@@ -768,10 +754,6 @@ module NewRelic
             shutdown
           end
 
-          def generate_environment_report
-            @environment_report = environment_for_connect
-          end
-
           # Checks whether we should send environment info, and if so,
           # returns the snapshot from the local environment.
           # Generating the EnvironmentReport has the potential to trigger
@@ -781,93 +763,49 @@ module NewRelic
             Agent.config[:send_environment_info] ? Array(EnvironmentReport.new) : []
           end
 
-          # We've seen objects in the environment report (Rails.env in
-          # particular) that can't seralize to JSON. Cope with that here and
-          # clear out so downstream code doesn't have to check again.
-          def sanitize_environment_report
-            if !@service.valid_to_marshal?(@environment_report)
-              @environment_report = []
-            end
+          # Constructs and memoizes an event_harvest_config hash to be used in 
+          # the payload sent during connect (and reconnect)
+          def event_harvest_config
+            @event_harvest_config ||= Configuration::EventHarvestConfig.from_config(Agent.config)
           end
 
-          # Initializes the hash of settings that we send to the
-          # server. Returns a literal hash containing the options
-          def connect_settings
-            sanitize_environment_report
-
-            {
-              :pid           => $$,
-              :host          => local_host,
-              :display_host  => Agent.config[:'process_host.display_name'],
-              :app_name      => Agent.config.app_names,
-              :language      => 'ruby',
-              :labels        => Agent.config.parsed_labels,
-              :agent_version => NewRelic::VERSION::STRING,
-              :environment   => @environment_report,
-              :settings      => Agent.config.to_collector_hash,
-              :high_security => Agent.config[:high_security],
-              :utilization   => UtilizationData.new.to_collector_hash,
-              :identifier    => "ruby:#{local_host}:#{Agent.config.app_names.sort.join(',')}"
-            }
-          end
-
-          # Returns connect data passed back from the server
+          # Builds the payload to send to the connect service,
+          # connects, then configures the agent using the response from 
+          # the connect service
           def connect_to_server
-            @service.connect(connect_settings)
-          end
+            request_builder = ::NewRelic::Agent::Connect::RequestBuilder.new \
+              @service,
+              Agent.config,
+              event_harvest_config
+            connect_response = @service.connect request_builder.connect_payload
 
-          # apdex_f is always 4 times the apdex_t
-          def apdex_f
-            (4 * Agent.config[:apdex_t]).to_f
-          end
+            response_handler = ::NewRelic::Agent::Connect::ResponseHandler.new(self, Agent.config)
+            response_handler.configure_agent(connect_response)
 
-          # Sets the collector host and connects to the server, then
-          # invokes the final configuration with the returned data
-          def query_server_for_configuration
-            finish_setup(connect_to_server)
+            log_connection connect_response if connect_response
+            connect_response
           end
 
-          # Takes a hash of configuration data returned from the
-          # server and uses it to set local variables and to
-          # initialize various parts of the agent that are configured
-          # separately.
-          #
-          # Can accommodate most arbitrary data - anything extra is
-          # ignored unless we say to do something with it here.
-          def finish_setup(config_data)
-            return if config_data == nil
-
-            @service.agent_id = config_data['agent_run_id']
-
-            security_policies = config_data.delete('security_policies')
-
-            add_server_side_config(config_data)
-            add_security_policy_config(security_policies) if security_policies
-
-            log_connection!(config_data)
-            @transaction_rules = RulesEngine.create_transaction_rules(config_data)
-            @stats_engine.metric_rules = RulesEngine.create_metric_rules(config_data)
-
-            # If you're adding something else here to respond to the server-side config,
-            # use Agent.instance.events.subscribe(:finished_configuring) callback instead!
+          # Logs when we connect to the server, for debugging purposes
+          # - makes sure we know if an agent has not connected
+          def log_connection(config_data)
+            ::NewRelic::Agent.logger.debug "Connected to NewRelic Service at #{@service.collector.name}"
+            ::NewRelic::Agent.logger.debug "Agent Run       = #{@service.agent_id}."
+            ::NewRelic::Agent.logger.debug "Connection data = #{config_data.inspect}"
+            if config_data['messages'] && config_data['messages'].any?
+              log_collector_messages(config_data['messages'])
+            end
           end
 
-          def add_server_side_config(config_data)
-            if config_data['agent_config']
-              ::NewRelic::Agent.logger.debug "Using config from server"
+          def log_collector_messages(messages)
+            messages.each do |message|
+              ::NewRelic::Agent.logger.send(message['level'].downcase, message['message'])
             end
-
-            ::NewRelic::Agent.logger.debug "Server provided config: #{config_data.inspect}"
-            server_config = NewRelic::Agent::Configuration::ServerSource.new(config_data, Agent.config)
-            Agent.config.replace_or_add_config(server_config)
           end
 
-          def add_security_policy_config(security_policies)
-            ::NewRelic::Agent.logger.info 'Installing security policies'
-            security_policy_source = NewRelic::Agent::Configuration::SecurityPolicySource.new(security_policies)
-            Agent.config.replace_or_add_config(security_policy_source)
-            # drop data collected before applying security policies
-            drop_buffered_data
+          # apdex_f is always 4 times the apdex_t
+          def apdex_f
+            (4 * Agent.config[:apdex_t]).to_f
           end
 
           class WaitOnConnectTimeout < StandardError
@@ -899,22 +837,6 @@ module NewRelic
             end
           end
 
-          # Logs when we connect to the server, for debugging purposes
-          # - makes sure we know if an agent has not connected
-          def log_connection!(config_data)
-            ::NewRelic::Agent.logger.debug "Connected to NewRelic Service at #{@service.collector.name}"
-            ::NewRelic::Agent.logger.debug "Agent Run       = #{@service.agent_id}."
-            ::NewRelic::Agent.logger.debug "Connection data = #{config_data.inspect}"
-            if config_data['messages'] && config_data['messages'].any?
-              log_collector_messages(config_data['messages'])
-            end
-          end
-
-          def log_collector_messages(messages)
-            messages.each do |message|
-              ::NewRelic::Agent.logger.send(message['level'].downcase, message['message'])
-            end
-          end
         end
         include Connect
 
@@ -974,7 +896,7 @@ module NewRelic
           return unless should_connect?(opts[:force_reconnect])
 
           ::NewRelic::Agent.logger.debug "Connecting Process to New Relic: #$0"
-          query_server_for_configuration
+          connect_to_server
           @connected_pid = $$
           @connect_state = :connected
           signal_connected
@@ -998,15 +920,6 @@ module NewRelic
           raise
         end
 
-        # Who am I? Well, this method can tell you your hostname.
-        def determine_host
-          NewRelic::Agent::Hostname.get
-        end
-
-        def local_host
-          @local_host ||= determine_host
-        end
-
         # Delegates to the control class to determine the root
         # directory of this project
         def determine_home_directory
@@ -1107,7 +1020,10 @@ module NewRelic
           harvest_and_send_from_container(transaction_event_aggregator, :analytic_event_data)
           harvest_and_send_from_container(synthetics_event_aggregator,  :analytic_event_data)
           harvest_and_send_from_container(@custom_event_aggregator,     :custom_event_data)
-          harvest_and_send_from_container(span_event_aggregator,        :span_event_data)
+        end
+
+        def harvest_and_send_span_event_data
+          harvest_and_send_from_container(span_event_aggregator, :span_event_data)
         end
 
         def harvest_and_send_error_event_data
@@ -1167,6 +1083,7 @@ module NewRelic
             harvest_and_send_transaction_traces
             harvest_and_send_slowest_sql
             harvest_and_send_timeslice_data
+            harvest_and_send_span_event_data
 
             check_for_and_handle_agent_commands
             harvest_and_send_for_agent_commands