pass agent_settings to the transport from the outside instead of tryi…

…ng to resolve it internally again
DataDog · Jul 22, 2024 · 3ad1c69 · 3ad1c69
1 parent ff8ffb8
commit 3ad1c69
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/lib/datadog/core/configuration/components.rb b/lib/datadog/core/configuration/components.rb
@@ -75,7 +75,7 @@ def build_telemetry(settings, agent_settings, logger)
                             dd_site: settings.site
                           )
                         else
-                          Datadog::Core::Telemetry::Http::Transport.build_agent_transport
+                          Datadog::Core::Telemetry::Http::Transport.build_agent_transport(agent_settings)
                         end
 
             Telemetry::Component.new(

diff --git a/lib/datadog/core/telemetry/http/transport.rb b/lib/datadog/core/telemetry/http/transport.rb
@@ -14,9 +14,7 @@ module Http
         # Class to send telemetry data to Telemetry API
         # Currently only supports the HTTP protocol.
         class Transport
-          def self.build_agent_transport
-            agent_settings = Configuration::AgentSettingsResolver.call(Datadog.configuration)
-
+          def self.build_agent_transport(agent_settings)
             Transport.new(
               host: agent_settings.hostname,
               port: agent_settings.port,

diff --git a/spec/datadog/core/configuration/components_spec.rb b/spec/datadog/core/configuration/components_spec.rb
@@ -261,7 +261,12 @@
               dependency_collection: dependency_collection, shutdown_timeout_seconds: shutdown_timeout_seconds }
           end
           let(:agent_settings) do
-            instance_double(Datadog::Core::Configuration::AgentSettingsResolver::AgentSettings, adapter: :unix)
+            instance_double(
+              Datadog::Core::Configuration::AgentSettingsResolver::AgentSettings,
+              adapter: :unix,
+              hostname: 'foo',
+              port: 1234
+            )
           end
 
           it 'does not enable telemetry for unsupported non-http transport' do

diff --git a/spec/datadog/core/telemetry/http/transport_spec.rb b/spec/datadog/core/telemetry/http/transport_spec.rb
@@ -4,8 +4,9 @@
 require 'datadog/core/telemetry/http/adapters/net'
 
 RSpec.describe Datadog::Core::Telemetry::Http::Transport do
-  subject(:transport) { described_class.build_agent_transport }
+  subject(:transport) { described_class.build_agent_transport(agent_settings) }
 
+  let(:agent_settings) { Datadog::Core::Configuration::AgentSettingsResolver.call(Datadog.configuration) }
   let(:hostname) { 'foo' }
   let(:port) { 1234 }