newrelic_rpm 6.12.0.367 → 6.13.0

data/.github/workflows/stale.yml

@@ -0,0 +1,21 @@
+name: "Close stale issues"
+on:
+  schedule:
+  - cron: "0 0 * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'This has been marked stale after 30 days with no activity. It will be closed in 5 days if there is no activity.'
+        stale-pr-message: 'Stale pull request message'
+        days-before-stale: 30
+        days-before-close: 5
+        stale-issue-label: 'stale'
+        exempt-issue-labels: 'good first issue,help wanted,in progress,on hold,in review,roadmap'
+        stale-pr-label: 'stale'
+        exempt-pr-labels: 'on hold,in review'
+

data/.gitignore

@@ -31,3 +31,6 @@ test/performance/script/log/
 infinite_tracing/log/
 infinite_tracing/test/new_relic/infinite_tracing/log
 test/fixtures/cross_agent_tests/*/README.md
+node_modules/
+yarn.lock
+errors.txt

data/CHANGELOG.md

@@ -1,38 +1,111 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## v6.13.0
+
+  * **Bugfix: never use redirect host when accessing preconnect endpoint**
+
+    When connecting to New Relic, the Ruby Agent uses the value in `Agent.config[:host]` to post a request to the New Relic preconnect endpoint. This endpoint returns a "redirect host" which is the URL to which agents send data from that point on.
+
+    Previously, if the agent needed to reconnect to the collector, it would incorrectly use this redirect host to call the preconnect
+    endpoint, when it should have used the original configured value in `Agent.config[:host]`. The agent now uses the correct host
+    for all calls to preconnect.
+
+  * **Bugfix: calling `add_custom_attributes` no longer modifies the params of the caller**
+
+    The previous agent's improvements to recording attributes at the span level had an unexpected
+    side-effect of modifying the params passed to the API call as duplicated attributes were deleted
+    in the process. This is now fixed and params passed in are no longer modified.
+
+    Thanks to Pete Johns (@johnsyweb) for the PR that resolves this bug.
+
+  * **Bugfix: `http.url` query parameters spans are now obfuscated**
+
+    Previously, the agent was recording the full URL of the external requests, including
+    the query and fragment parts of the URL as part of the attributes on the external request
+    span.  This has been fixed so that the URL is obfuscated to filter out potentially sensitive data.
+
+  * **Use system SSL certificates by default**
+
+    The Ruby agent previously used a root SSL/TLS certificate bundle by default. Now the agent will attempt to use
+    the default system certificates, but will fall back to the bundled certs if there is an issue (and log that this occurred).
+
+  * **Bugfix: reduce allocations for segment attributes**
+
+    Previously, every segment received an `Attributes` object on initialization. The agent now lazily creates attributes
+    on segments, resulting in a significant reduction in object allocations for a typical transaction.
+
+  * **Bugfix: eliminate errors around Rake::VERSION with Rails**
+
+    When running a Rails application with rake tasks, customers could see the following error:
+
+  * **Prevent connecting agent thread from hanging on shutdown**
+
+    A bug in `Net::HTTP`'s Gzip decoder can cause the (un-catchable)
+    thread-kill exception to be replaced with a (catchable) `Zlib` exception,
+    which prevents a connecting agent thread from exiting during shutdown,
+    causing the Ruby process to hang indefinitely.
+    This workaround checks for an `aborting` thread in the `#connect` exception handler
+    and re-raises the exception, allowing a killed thread to continue exiting.
+
+    Thanks to Will Jordan (@wjordan) for chasing this one down and patching with tests.
+
+  * **Fix error messages about Rake instrumentation**
+
+    When running a Rails application with rake tasks, customers could see the following error in logs resulting from
+    a small part of rake functionality being loaded with the Rails test runner:
+
+    ```
+    ERROR : Error while detecting rake_instrumentation:
+    ERROR : NameError: uninitialized constant Rake::VERSION
+    ```
+
+    Such error messages should no longer appear in this context.
+
+    Thanks to @CamilleDrapier for pointing out this issue.
+
+  * **Remove NewRelic::Metrics**
+
+    The `NewRelic::Metrics` module has been removed from the agent since it is no longer used.
+
+    Thanks to @csaura for the contribution!
+
   ## v6.12.0
 
+  * The New Relic Ruby Agent is now open source under the [Apache 2 license](LICENSE)
+    and you can now observe the project roadmap. See our [Contributing guide](https://github.com/newrelic/newrelic-ruby-agent/blob/main/CONTRIBUTING.md)
+    and [Code of Conduct](https://github.com/newrelic/.github/blob/master/CODE_OF_CONDUCT.md) for details on contributing!
+
   * **Security: Updated all uses of Rake to >= 12.3.3**
 
     All versions of Rake testing prior to 12.3.3 were removed to address
     [CVE-2020-8130](https://nvd.nist.gov/vuln/detail/CVE-2020-8130).
     No functionality in the agent was removed nor deprecated with this change, and older versions
-    of rake are expected to continue to work as they have in the past.  However, versions of 
+    of rake are expected to continue to work as they have in the past.  However, versions of
     rake < 12.3.3 are no longer tested nor supported.
 
   * **Bugfix: fixes an error capturing content length in middleware on multi-part responses**
 
-    In the middleware tracing, the `Content-Length` header is sometimes returned as an array of 
-    values when content is a multi-part response.  Previously, the agent would fail with 
-    "NoMethodError: undefined method `to_i` for Array" Error.  This bug is now fixed and 
+    In the middleware tracing, the `Content-Length` header is sometimes returned as an array of
+    values when content is a multi-part response.  Previously, the agent would fail with
+    "NoMethodError: undefined method `to_i` for Array" Error.  This bug is now fixed and
     multi-part content lengths are summed for a total when an `Array` is present.
-    
+
   * **Added support for auto-instrumenting Mongo gem versions 2.6 to 2.12**
-  
+
   * **Bugfix: MongoDB instrumentation did not handle CommandFailed events when noticing errors**
 
     The mongo gem sometimes returns a CommandFailed object instead of a CommandSucceeded object with
     error attributes populated.  The instrumentation did not handle noticing errors on CommandFailed
     objects and resulted in logging an error and backtrace to the log file.
 
-    Additionally, a bug in recording the metric for "findAndModify" as all lowercased "findandmodify" 
+    Additionally, a bug in recording the metric for "findAndModify" as all lowercased "findandmodify"
     for versions 2.1 through 2.5 was fixed.
 
   * **Bugfix: Priority Sampler causes crash in high throughput environents in rare cases**
 
     Previously, the priority sampling buffer would, in rare cases, generate an error in high-throughput
     environments once capacity is reached and the sampling algorthym engages.  This issue is fixed.
-    
+
   * **Additional Transaction Information applied to Span Events**
 
     When Distributed Tracing and/or Infinite Tracing are enabled, the Agent will now incorporate additional information from the Transaction Event on to the root Span Event of the transaction.

data/CONTRIBUTING.md

@@ -6,8 +6,8 @@ development team.
 
 When contributing, keep in mind that the agent runs in a wide variety of Ruby
 language implementations (e.g. 2.x.x, jruby, etc.) as well as a wide variety of
-application environments (e.g. Rails, Sinatra, roll-your-own, etc.) See
-https://docs.newrelic.com/docs/agents/ruby-agent/getting-started/ruby-agent-requirements-supported-frameworks
+application environments (e.g. Rails, Sinatra, roll-your-own, etc.) See [Ruby agent requirements and supported frameworks]
+(https://docs.newrelic.com/docs/agents/ruby-agent/getting-started/ruby-agent-requirements-supported-frameworks)
 for the current full list.
 
 Because of this, we need to be more defensive in our coding practices than most
@@ -17,12 +17,52 @@ we can't assume the presence of any specific libraries, including `ActiveSupport
 
 ## Process
 
+### Version Support
+
+When contributing, keep in mind that New Relic customers (that's you!) are
+running many different versions of Ruby, some of them pretty old. Changes that
+depend on the newest version of Ruby will probably be rejected, especially if
+they replace something backwards compatible.
+
+Be aware that the instrumentation needs to work with a wide range of versions of
+the instrumented modules, and that code that looks nonsensical or
+overcomplicated may be that way for compatibility-related reasons. Read all the
+comments and check the related tests before deciding whether existing code is
+incorrect.
+
+If you are planning on contributing a new feature or an otherwise complex
+contribution, we kindly ask you to start a conversation with the maintainer team
+by opening up an Github issue first.
+
+
+### General Guidelines
+The Ruby agent avoids requiring any dependencies in the main agent code base.
+Instrumentations and features that would otherwise require a dependency (such as
+Infinite Tracing, which require gRPC and protobuf) are built as separate gems.
+If you have a feature or instrumentation request that would require a
+dependency, please open an Issue to discuss with the maintainers before
+proceeding.
+
+Your code will be evaluated for completeness and accuracy in
+implementation and must be accompanied with appropriate unit tests.  New
+additions that do not break existing tests are the easiest and quickest to be
+accepted and merged.  New features and improvements that break existing
+functionality are slower to be accepted and merged as they require agreement
+with maintainers across a majority of the languages New Relic supports.  Any
+such breaking changes will require a major version bump whereas non-breaking
+additions only lead to minor version bumps.
+
+Please be aware that the maintainers of New Relic’s agents aim to have as much
+commonality of functionality across all language agents as makes sense, so we are
+always working to reconcile language-specific changes against the cross-language
+community set of agreements.
+
 ### Feature Requests
 
 Feature requests should be submitted in the [Issue tracker](../../issues), with
 a description of the expected behavior & use case. Before submitting an Issue,
 please search for similar ones in the [closed
-issues](../../issues?q=is%3Aissue+is%3Aclosed+label%3Aenhancement).
+issues](../../issues?q=is%3Aissue+is%3Aclosed).
 
 ### Pull Requests
 
@@ -31,9 +71,9 @@ licensing restrictions.
 
 ### Code of Conduct
 
-Before contributing please read the [code of conduct](./CODE_OF_CONDUCT.md)
+Before contributing please read the [code of conduct](https://github.com/newrelic/.github/blob/master/CODE_OF_CONDUCT.md)
 
-Note that our [code of conduct](./CODE_OF_CONDUCT.md) applies to all platforms
+Note that our [code of conduct](https://github.com/newrelic/.github/blob/master/CODE_OF_CONDUCT.md) applies to all platforms
 and venues related to this project; please follow it in all your interactions
 with the project and its participants.
 
@@ -61,13 +101,16 @@ Running the test suite is simple.  Just invoke:
     bundle
     bundle exec rake
 
-This will run the unit tests in standalone mode, bootstrapping a basic Rails
-3.2 environment for the agent to instrument, then executing the test suite.
+This will run the unit tests in standalone mode. You can run against a specific Rails version
+by passing the version name (which should match the name of a subdirectory in test/environments)
+as an argument to the test:env rake task, like this:
+
+bundle exec rake test:env[rails60]
 
 These tests are setup to run automatically in
-[Travis CI](https://travis-ci.org/newrelic/rpm) under several Ruby implementations.
-When you've pushed your changes to GitHub, you can confirm that the Travis
-build passes for your fork.
+[GitHub Actions](https://github.com/newrelic/newrelic-ruby-agent/actions) under several
+Ruby implementations. When you've pushed your changes to GitHub, you can confirm that
+the GitHub Actions test matrix passes for your fork.
 
 Additionally, our own CI jobs runs these tests under multiple versions of Rails
 to verify compatibility.
@@ -124,7 +167,7 @@ practices. Like all official New Relic open source projects, there's a related
 Community topic in the New Relic Explorers Hub. You can find this project's
 topic/threads here:
 
-[Explorer's Hub](https://discuss.newrelic.com/c/support-products-agents/ruby-agent)
+[Explorer's Hub](https://discuss.newrelic.com/tags/rubyagent)
 
 ## And Finally...
 

data/README.md

@@ -1,11 +1,11 @@
-[![Community Project header](https://github.com/newrelic/opensource-website/raw/master/src/images/categories/Community_Project.png)](https://opensource.newrelic.com/oss-category/#community-project)
+[![Community Plus header](https://github.com/newrelic/opensource-website/raw/master/src/images/categories/Community_Plus.png)](https://opensource.newrelic.com/oss-category/#community-plus)
 
 # New Relic Ruby Agent
 
-The New Relic Ruby agent monitors your applications to help you 
-[identify and solve performance issues](https://docs.newrelic.com/docs/agents/ruby-agent/getting-started/introduction-new-relic-ruby#monitor-performance). 
-You can also extend the agent's performance monitoring to 
-[collect and analyze business data](https://docs.newrelic.com/docs/agents/ruby-agent/getting-started/introduction-new-relic-ruby#business-data) 
+The New Relic Ruby agent monitors your applications to help you
+[identify and solve performance issues](https://docs.newrelic.com/docs/agents/ruby-agent/getting-started/introduction-new-relic-ruby#monitor-performance).
+You can also extend the agent's performance monitoring to
+[collect and analyze business data](https://docs.newrelic.com/docs/agents/ruby-agent/getting-started/introduction-new-relic-ruby#business-data)
 to help you improve the customer experience and make data-driven business decisions.
 
 The New Relic Ruby Agent is dual-purposed as a either a Gem or a Rails plugin,
@@ -79,29 +79,53 @@ for more information.
 
 ## Support
 
-New Relic hosts and moderates an online forum where customers can interact with New Relic employees as well as other customers to get help and share best practices. Like all official New Relic open source projects, there's a related Community topic in the New Relic Explorers Hub. You can find this project's topic/threads here:
+Should you need assistance with New Relic products, you are in good hands with several support diagnostic tools and support channels.
 
-https://discuss.newrelic.com/c/support-products-agents/ruby-agent
+This [troubleshooting framework](https://discuss.newrelic.com/t/ruby-troubleshooting-framework-install/108685) steps you through common troubleshooting questions.
+
+New Relic offers NRDiag, [a client-side diagnostic utility](https://docs.newrelic.com/docs/using-new-relic/cross-product-functions/troubleshooting/new-relic-diagnostics) that automatically detects common problems with New Relic agents. If NRDiag detects a problem, it suggests troubleshooting steps. NRDiag can also automatically attach troubleshooting data to a New Relic Support ticket.
+
+If the issue has been confirmed as a bug or is a Feature request, please file a Github issue.
+
+**Support Channels**
+
+* [New Relic Documentation](https://docs.newrelic.com/docs/agents/ruby-agent): Comprehensive guidance for using our platform
+* [New Relic Community](https://discuss.newrelic.com/tags/rubyagent): The best place to engage in troubleshooting questions
+* [New Relic Developer](https://developer.newrelic.com/): Resources for building a custom observability applications
+* [New Relic University](https://learn.newrelic.com/): A range of online training for New Relic users of every level
+* [New Relic Technical Support](https://support.newrelic.com/) 24/7/365 ticketed support. Read more about our [Technical Support Offerings](https://docs.newrelic.com/docs/licenses/license-information/general-usage-licenses/support-plan).
+
+## Privacy
+
+At New Relic we take your privacy and the security of your information seriously, and are committed to protecting your information. We must emphasize the importance of not sharing personal data in public forums, and ask all users to scrub logs and diagnostic information for sensitive information, whether personal, proprietary, or otherwise.
+
+We define “Personal Data” as any information relating to an identified or identifiable individual, including, for example, your name, phone number, post code or zip code, Device ID, IP address and email address.
+
+Please review [New Relic’s General Data Privacy Notice](https://newrelic.com/termsandconditions/privacy) for more information.
+
+## Roadmap
+See our [roadmap](https://github.com/newrelic/newrelic-ruby-agent/blob/main/ROADMAP.md), to learn more about our product vision, understand our plans, and provide us valuable feedback.
 
 ## Contributing
 
 We encourage contributions to improve the New Relic Ruby agent! Keep in mind when you submit your pull request, you'll need to sign the CLA via the click-through using CLA-Assistant. You only have to sign the CLA one time per project.
 If you have any questions, or to execute our corporate CLA, required if your contribution is on behalf of a company,  please drop us an email at opensource@newrelic.com.
 
-If you would like to contribute to this project, please review [these guidelines](./CONTRIBUTING.md).
+**A note about vulnerabilities**
+
+As noted in our [security policy](https://github.com/newrelic/newrelic-ruby-agent/security/policy), New Relic is committed to the privacy and security of our customers and their data. We believe that providing coordinated disclosure by security researchers and engaging with the security community are important means to achieve our security goals.
+
+If you believe you have found a security vulnerability in this project or any of New Relic's products or websites, we welcome and greatly appreciate you reporting it to New Relic through [HackerOne](https://hackerone.com/newrelic).
+
+If you would like to contribute to this project, please review [these guidelines](https://github.com/newrelic/newrelic-ruby-agent/blob/main/CONTRIBUTING.md).
 
-To [all contributors](https://github.com/newrelic/newrelic-ruby-agent/graphs/contributors), we thank you!  Without your contribution, this project would not be what it is today.  We also host a community project page dedicated to 
+To [all contributors](https://github.com/newrelic/newrelic-ruby-agent/graphs/contributors), we thank you!  Without your contribution, this project would not be what it is today.  We also host a community project page dedicated to
 the [New Relic Ruby agent](https://opensource.newrelic.com/projects/newrelic/newrelic-ruby-agent).
 
 ## License
 
 The New Relic Ruby agent is licensed under the [Apache 2.0](http://apache.org/licenses/LICENSE-2.0.txt) License.
-The New Relic Ruby agent also uses source code from third-party libraries. Full details on which libraries are used and the terms under which they are licensed can be found in the [THIRD_PARTY_NOTICES.md](./THIRD_PARTY_NOTICES.md).
-
-## Support
-
-You can find more detailed documentation [on our website](http://newrelic.com/docs),
-and specifically in the [Ruby category](http://newrelic.com/docs/ruby).
+The New Relic Ruby agent also uses source code from third-party libraries. Full details on which libraries are used and the terms under which they are licensed can be found in the [THIRD_PARTY_NOTICES.md](https://github.com/newrelic/newrelic-ruby-agent/blob/main/THIRD_PARTY_NOTICES.md).
 
 ## Thank You
 
@@ -109,4 +133,4 @@ Thank you, and may your application scale to infinity plus one.
 
 Lew Cirne, Founder and CEO
 
-New Relic, Inc.
+New Relic, Inc.

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/lib/new_relic/agent.rb

@@ -26,7 +26,6 @@ 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'
@@ -587,9 +586,8 @@ module NewRelic
         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
-          segment_custom_keys.each { |k| params.delete k.to_sym }
-          segment.add_custom_attributes(params)
+          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}")

data/lib/new_relic/agent/agent.rb

@@ -953,6 +953,10 @@ module NewRelic
         rescue NewRelic::Agent::UnrecoverableAgentException => e
           handle_unrecoverable_agent_error(e)
         rescue StandardError, Timeout::Error, NewRelic::Agent::ServerConnectionException => e
+          # Allow a killed (aborting) thread to continue exiting during shutdown.
+          # See: https://github.com/newrelic/newrelic-ruby-agent/issues/340
+          raise if Thread.current.status == 'aborting'
+
           log_error(e)
           if opts[:keep_retrying]
             note_connect_failure

data/lib/new_relic/agent/http_clients/uri_util.rb

@@ -15,13 +15,13 @@ module NewRelic
     module HTTPClients
       module URIUtil
 
-        def self.filter_uri(original)
-          filtered = original.dup
-          filtered.user = nil
-          filtered.password = nil
-          filtered.query = nil
-          filtered.fragment = nil
-          filtered.to_s
+        def self.obfuscated_uri(url)
+          parse_and_normalize_url(url).tap do |obfuscated|
+            obfuscated.user = nil
+            obfuscated.password = nil
+            obfuscated.query = nil
+            obfuscated.fragment = nil
+          end
         end
 
         # There are valid URI strings that some HTTP client libraries will

data/lib/new_relic/agent/instrumentation/rake.rb

@@ -8,6 +8,7 @@ DependencyDetection.defer do
 
   depends_on do
     defined?(::Rake) &&
+      defined?(::Rake::VERSION) &&
       ::NewRelic::Agent.config[:'disable_rake'] == false &&
       ::NewRelic::Agent.config[:'rake.tasks'].any? &&
       ::NewRelic::Agent::Instrumentation::RakeInstrumentation.should_install?

data/lib/new_relic/agent/new_relic_service.rb

@@ -38,8 +38,10 @@ module NewRelic
       def initialize(license_key=nil, collector=control.server)
         @license_key = license_key
         @collector = collector
+        @configured_collector = collector
         @request_timeout = Agent.config[:timeout]
         @ssl_cert_store = nil
+        @use_bundled_certs = false
         @in_session = nil
         @agent_id = nil
         @shared_tcp_connection = nil
@@ -290,12 +292,20 @@ module NewRelic
         # installed
         conn.use_ssl     = true
         conn.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        conn.cert_store  = ssl_cert_store
+        set_cert_store(conn)
       rescue StandardError, LoadError
         msg = "SSL is not available in the environment; please install SSL support."
         raise UnrecoverableAgentException.new(msg)
       end
 
+      def set_cert_store(conn)
+        if @use_bundled_certs || NewRelic::Agent.config[:ca_bundle_path]
+          conn.cert_store  = ssl_cert_store
+        else
+          ::NewRelic::Agent.logger.debug("Using default security certificates")
+        end
+      end
+
       def start_connection(conn)
         NewRelic::Agent.logger.debug("Opening TCP connection to #{conn.address}:#{conn.port}")
         Timeout.timeout(@request_timeout) { conn.start }
@@ -337,6 +347,14 @@ module NewRelic
         conn = create_http_connection
         start_connection(conn)
         conn
+      rescue Timeout::Error
+        if @use_bundled_certs == false
+          ::NewRelic::Agent.logger.info("Unable to connect. Falling back to bundled security certificates")
+          @use_bundled_certs = true
+          retry
+        else
+          raise
+        end
       end
 
       # The path to the certificate file used to verify the SSL
@@ -346,6 +364,7 @@ module NewRelic
           NewRelic::Agent.logger.warn("Couldn't find CA bundle from configured ca_bundle_path: #{path_override}") unless File.exist? path_override
           path_override
         else
+          ::NewRelic::Agent.increment_metric("Supportability/Ruby/Certificate/BundleRequired")
           File.expand_path(File.join(control.newrelic_root, 'cert', 'cacert.pem'))
         end
       end
@@ -415,15 +434,18 @@ module NewRelic
         data, encoding = compress_request_if_needed(data, method)
         size = data.size
 
+        # Preconnect needs to always use the configured collector host, not the redirect host
+        endpoint_specific_collector = (method == :preconnect) ? @configured_collector : @collector
+
         uri = remote_method_uri(method)
-        full_uri = "#{@collector}#{uri}"
+        full_uri = "#{endpoint_specific_collector}#{uri}"
 
         @audit_logger.log_request(full_uri, payload, @marshaller)
         request_send_ts = Time.now
         response = send_request(:data      => data,
                                 :uri       => uri,
                                 :encoding  => encoding,
-                                :collector => @collector,
+                                :collector => endpoint_specific_collector,
                                 :endpoint  => method)
         response_check_ts = Time.now
         @marshaller.load(decompress_response(response))