move agent settings resolving from telemetry transport initializer to…

… a factory method
DataDog · Jul 11, 2024 · c46f299 · c46f299
1 parent 6b8e4b1
commit c46f299
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/lib/datadog/core/configuration/components.rb b/lib/datadog/core/configuration/components.rb
@@ -63,7 +63,7 @@ def build_telemetry(settings, agent_settings, logger)
             end
 
             Telemetry::Component.new(
-              http_transport: Datadog::Core::Telemetry::Http::Transport.new,
+              http_transport: Datadog::Core::Telemetry::Http::Transport.build_agent_transport,
               enabled: enabled,
               metrics_enabled: enabled && settings.telemetry.metrics_enabled,
               heartbeat_interval_seconds: settings.telemetry.heartbeat_interval_seconds,

diff --git a/lib/datadog/core/telemetry/http/transport.rb b/lib/datadog/core/telemetry/http/transport.rb
@@ -13,18 +13,27 @@ 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)
+
+            Transport.new(
+              host: agent_settings.hostname,
+              port: agent_settings.port,
+              path: Http::Ext::AGENT_ENDPOINT
+            )
+          end
+
           attr_reader \
             :host,
             :port,
             :ssl,
             :path
 
-          def initialize
-            agent_settings = Configuration::AgentSettingsResolver.call(Datadog.configuration)
-            @host = agent_settings.hostname
-            @port = agent_settings.port
-            @ssl = false
-            @path = Http::Ext::AGENT_ENDPOINT
+          def initialize(host:, port:, path:, ssl: false)
+            @host = host
+            @port = port
+            @ssl = ssl
+            @path = path
           end
 
           def request(request_type:, payload:)

diff --git a/sig/datadog/core/telemetry/http/transport.rbs b/sig/datadog/core/telemetry/http/transport.rbs
@@ -13,7 +13,7 @@ module Datadog
 
           attr_reader path: String
 
-          def initialize: () -> void
+          def initialize: (host: String, port: Integer, path: String, ?ssl: bool) -> void
 
           def request: (request_type: String, payload: String) -> Datadog::Core::Telemetry::Http::Adapters::Net::response
 

diff --git a/spec/datadog/core/telemetry/http/transport_spec.rb b/spec/datadog/core/telemetry/http/transport_spec.rb
@@ -4,12 +4,12 @@
 require 'datadog/core/telemetry/http/adapters/net'
 
 RSpec.describe Datadog::Core::Telemetry::Http::Transport do
-  subject(:transport) { described_class.new }
+  subject(:transport) { described_class.build_agent_transport }
 
   let(:hostname) { 'foo' }
   let(:port) { 1234 }
 
-  describe '#initialize' do
+  describe '.build_agent_transport' do
     before do
       Datadog.configuration.agent.host = hostname
       Datadog.configuration.agent.port = port