newrelic_rpm 6.2.0.354 → 6.7.0.359

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61ee707dd3738565b01b05857ed9ae7de00a6ab3e9cc0522ba5d651819c24634
-  data.tar.gz: e8b630ad8f1c69a51dae797a046f90bd8d87683dcc4a2fb97f2960dcf6f90b4b
+  metadata.gz: e0981d305747247f1ac56c96ff7268cfd8b9bd7d419e8b800f2daf9193ae1dee
+  data.tar.gz: 9b4ca44ed6641fe4ea5f71296d8042f3ed5024a9d8d1dc3230241f02cab529fd
 SHA512:
-  metadata.gz: 9ee286b42523ceca71287a9463a6e6a66e825f27956fd460c72aacb640780a20db0e5c688951f2d0a4bb648a4d8bd5dad98220d1f5a98e9abcc51843bd71aa1e
-  data.tar.gz: 1a5070f668fd0b4f802ee71fe3909c123d0b38a53a1491ec07a496177cf9f392015c95ae62284b086a4fd27952fa0e62a7d720813de09449f5b4b8b8c4331a5e
+  metadata.gz: 8596846993859508c5acf8fc54155572332a75258f1970b01b9d89974ec7a4f935d5f728f2826bbac8190e49f368e51d961b6754f2742248a228458fa225763d
+  data.tar.gz: b07bc5d7dbd98faec43a76514ac6314f5f9c8667941db20b68ac4f13fddbf69656c7b75d1d3b02f4c1d46873aecf528bd5062c96f4895bf2a4234bd48da5999d

data/.travis.yml

@@ -6,7 +6,10 @@ services:
 
 language: ruby
 
+dist: precise
 sudo: required
+jdk:
+  - oraclejdk8
 
 before_install:
   # RUBY-2072 Prevent Travis setup failure before our test even starts
@@ -15,6 +18,7 @@ before_install:
   - 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
@@ -40,11 +44,6 @@ 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.2.6.0
@@ -56,6 +55,9 @@ rvm:
   - 2.1.10
   - 2.0.0-p648
 
+jdk:
+  - oraclejdk8
+
 env:
   global:
     - BUNDLE_PATH=/home/travis/bundle
@@ -75,6 +77,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
@@ -89,6 +92,9 @@ env:
     - TYPE=NULLVERSE
 
 matrix:
+  allow_failures:
+    - rvm: jruby-9.2.6.0
+      env: TYPE=FUNCTIONAL GROUP=agent
   fast_finish: true
   exclude:
     # Unsupported Rails/Ruby combinations
@@ -127,18 +133,32 @@ 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=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
@@ -151,3 +171,5 @@ matrix:
       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/CHANGELOG.md

@@ -1,19 +1,170 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## v6.7.0
+
+  * **Trace and Entity Metadata API**
+
+    Several new API methods have been added to the agent:
+    * [`Agent#linking_metadata`](https://www.rubydoc.info/github/newrelic/rpm/NewRelic/Agent#linking_metadata-instance_method)
+    * [`Tracer#trace_id`](https://www.rubydoc.info/github/newrelic/rpm/NewRelic/Agent/Tracer#trace_id-class_method)
+    * [`Tracer#span_id`](https://www.rubydoc.info/github/newrelic/rpm/NewRelic/Agent/Tracer#span_id-class_method)
+    * [`Tracer#sampled?`](https://www.rubydoc.info/github/newrelic/rpm/NewRelic/Agent/Tracer#sampled?-class_method)
+
+    These API methods allow you to access information that can be used to link data of your choosing to a trace or entity.
+
+  * **Logs in Context**
+
+    This version of the agent includes a logger, which can be used in place of `::Logger`
+    from the standard library, or `ActiveSupport::Logger` from Rails.  This logger
+    leverages the new trace and entity metadata API to decorate log statements with entity
+    and trace metadata, so they can be correlated together in the New Relic UI.
+
+    For more information on how to use logs in context, see https://docs.newrelic.com/docs/enable-logs-context-ruby
+
+  * **Project metadata in Gemspec**
+
+     Project metadata has been added to the gemspec file. This means our Rubygems page will allow users to more easily
+     access the agent's source code, raise issues, and read the changelog.
+
+     Thanks to Orien Madgwick for the contribution!
+
+## 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. 
+    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 
+    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 
+    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

data/lib/new_relic/agent.rb

@@ -55,6 +55,7 @@ module NewRelic
     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/instrumentation/controller_instrumentation'
 
@@ -660,6 +661,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

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.
@@ -327,7 +332,7 @@ module NewRelic
           end
 
           def log_app_name
-            ::NewRelic::Agent.logger.info "Application: #{Agent.config.app_names.join(", ")}"
+            ::NewRelic::Agent.logger.info "Application: #{Agent.config[:app_name].join(", ")}"
           end
 
           def log_ignore_url_regexes
@@ -340,7 +345,7 @@ module NewRelic
 
           # Logs the configured application names
           def app_name_configured?
-            names = Agent.config.app_names
+            names = Agent.config[:app_name]
             return names.respond_to?(:any?) && names.any?
           end
 
@@ -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
@@ -557,7 +561,10 @@ module NewRelic
         def flush_pipe_data
           if connected? && @service.is_a?(::NewRelic::Agent::PipeService)
             transmit_data
-            transmit_event_data
+            transmit_analytic_event_data
+            transmit_custom_event_data
+            transmit_error_event_data
+            transmit_span_event_data
           end
         end
 
@@ -571,40 +578,48 @@ 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
+          LOG_ONCE_KEYS_RESET_PERIOD = 60.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
+          # Certain event types may sometimes need to be on the same interval as metrics,
+          # so we will check config assigned in EventHarvestConfig to determine the interval
+          # on which to report them
+          def interval_for event_type
+            interval = Agent.config[:"event_report_period.#{event_type}"]
+            :"#{interval}_second_harvest"
           end
 
-          LOG_ONCE_KEYS_RESET_PERIOD = 60.0
+          ANALYTIC_EVENT_DATA = "analytic_event_data".freeze
+          CUSTOM_EVENT_DATA = "custom_event_data".freeze
+          ERROR_EVENT_DATA = "error_event_data".freeze
+          SPAN_EVENT_DATA = "span_event_data".freeze
 
           def create_and_run_event_loop
+            data_harvest = :"#{Agent.config[:data_report_period]}_second_harvest"
+            event_harvest = :"#{Agent.config[:event_report_period]}_second_harvest"
+
             @event_loop = create_event_loop
-            @event_loop.on(:report_data) do
+            @event_loop.on(data_harvest) do
               transmit_data
             end
-            @event_loop.on(:report_event_data) do
-              transmit_event_data
+
+            @event_loop.on(interval_for ANALYTIC_EVENT_DATA) do
+              transmit_analytic_event_data
+            end
+            @event_loop.on(interval_for CUSTOM_EVENT_DATA) do
+              transmit_custom_event_data
+            end
+            @event_loop.on(interval_for ERROR_EVENT_DATA) do
+              transmit_error_event_data
+            end
+            @event_loop.on(interval_for SPAN_EVENT_DATA) do
+              transmit_span_event_data
             end
             @event_loop.on(:reset_log_once_keys) do
               ::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(LOG_ONCE_KEYS_RESET_PERIOD,              :reset_log_once_keys)
+            @event_loop.fire_every(Agent.config[:data_report_period], data_harvest)
+            @event_loop.fire_every(Agent.config[:event_report_period], event_harvest)
+            @event_loop.fire_every(LOG_ONCE_KEYS_RESET_PERIOD, :reset_log_once_keys)
 
             @event_loop.run
           end
@@ -768,10 +783,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 +792,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 +866,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 +925,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 +949,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
@@ -1106,14 +1048,20 @@ module NewRelic
         def harvest_and_send_analytic_event_data
           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_custom_event_data
+          harvest_and_send_from_container(@custom_event_aggregator, :custom_event_data)
         end
 
         def harvest_and_send_error_event_data
           harvest_and_send_from_container @error_collector.error_event_aggregator, :error_event_data
         end
 
+        def harvest_and_send_span_event_data
+          harvest_and_send_from_container(span_event_aggregator, :span_event_data)
+        end
+
         def check_for_and_handle_agent_commands
           begin
             @agent_command_router.check_for_and_handle_agent_commands
@@ -1134,18 +1082,30 @@ module NewRelic
           NewRelic::Agent.record_metric("Supportability/remote_unavailable/#{endpoint.to_s}", 0.0)
         end
 
-        def transmit_event_data
-          transmit_single_data_type(:harvest_and_send_analytic_event_data, "TransactionEvent")
+        TRANSACTION_EVENT = "TransactionEvent".freeze
+        def transmit_analytic_event_data
+          transmit_single_data_type(:harvest_and_send_analytic_event_data, TRANSACTION_EVENT)
+        end
+
+        CUSTOM_EVENT = "CustomEvent".freeze
+        def transmit_custom_event_data
+          transmit_single_data_type(:harvest_and_send_custom_event_data, CUSTOM_EVENT)
+        end
+
+        ERROR_EVENT = "ErrorEvent".freeze
+        def transmit_error_event_data
+          transmit_single_data_type(:harvest_and_send_error_event_data, ERROR_EVENT)
         end
 
+        SPAN_EVENT = "SpanEvent".freeze
         def transmit_span_event_data
-          transmit_single_data_type(:harvest_and_send_span_event_data, "SpanEvent")
+          transmit_single_data_type(:harvest_and_send_span_event_data, SPAN_EVENT)
         end
 
         def transmit_single_data_type(harvest_method, supportability_name)
           now = Time.now
 
-          msg = "Sending #{harvest_method.to_s.gsub("harvest_and_send_", "")} to New Relic Service"
+          msg = "Sending #{supportability_name} data to New Relic Service"
           ::NewRelic::Agent.logger.debug msg
 
           @service.session do # use http keep-alive
@@ -1167,6 +1127,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
@@ -1191,7 +1152,10 @@ module NewRelic
 
               @events.notify(:before_shutdown)
               transmit_data
-              transmit_event_data
+              transmit_analytic_event_data
+              transmit_custom_event_data
+              transmit_error_event_data
+              transmit_span_event_data
 
               if @connected_pid == $$ && !@service.kind_of?(NewRelic::Agent::NewRelicService)
                 ::NewRelic::Agent.logger.debug "Sending New Relic service agent run shutdown message"