DEBUG-3700 Remove duplicated classes from Telemetry transport

lib/datadog/core/telemetry/emitter.rb

@@ -2,6 +2,7 @@
 
 require_relative 'request'
 require_relative 'http/transport'
+require_relative '../transport/response'
 require_relative '../utils/sequence'
 require_relative '../utils/forking'
 
@@ -25,11 +26,11 @@ def request(event)
           seq_id = self.class.sequence.next
           payload = Request.build_payload(event, seq_id)
           res = @http_transport.request(request_type: event.type, payload: payload.to_json)
-          Datadog.logger.debug { "Telemetry sent for event `#{event.type}` (code: #{res.code.inspect})" }
+          Datadog.logger.debug { "Telemetry sent for event `#{event.type}` (response: #{res})" }
           res
         rescue => e
           Datadog.logger.debug("Unable to send telemetry request for event `#{event.type rescue 'unknown'}`: #{e}")
-          Telemetry::Http::InternalErrorResponse.new(e)
+          Core::Transport::InternalErrorResponse.new(e)
         end
 
         # Initializes a Sequence object to track seq_id if not already initialized; else returns stored

lib/datadog/core/telemetry/http/transport.rb

@@ -3,9 +3,8 @@
 require_relative '../../configuration/settings'
 require_relative '../../environment/ext'
 require_relative '../../transport/ext'
-require_relative 'env'
 require_relative 'ext'
-require_relative 'adapters/net'
+require_relative '../../transport/http/adapters/net'
 
 module Datadog
   module Core
@@ -53,7 +52,7 @@ def initialize(host:, port:, path:, ssl: false, api_key: nil)
           end
 
           def request(request_type:, payload:)
-            env = Http::Env.new
+            env = Core::Transport::HTTP::Env.new(Core::Transport::Request.new)
             env.path = @path
             env.body = payload
             env.headers = headers(request_type: request_type)
@@ -81,7 +80,16 @@ def headers(request_type:, api_version: Http::Ext::API_VERSION)
           end
 
           def adapter
-            @adapter ||= Http::Adapters::Net.new(hostname: @host, port: @port, ssl: @ssl)
+            @adapter ||= begin
+              agent_settings = Core::Configuration::AgentSettingsResolver::AgentSettings.new(
+                adapter: Core::Configuration::Ext::Agent::HTTP::ADAPTER,
+                ssl: @ssl,
+                hostname: @host,
+                port: @port,
+                # TODO: get timeout_seconds from somewhere
+              )
+              Core::Transport::HTTP::Adapters::Net.new(agent_settings)
+            end
           end
         end
       end

sig/datadog/core/configuration/agent_settings_resolver.rbs

@@ -3,9 +3,9 @@ module Datadog
     module Configuration
       class AgentSettingsResolver
         class AgentSettings
-          def initialize: (adapter: untyped, ssl: untyped, hostname: untyped, port: untyped, uds_path: untyped, timeout_seconds: untyped) -> void
+          def initialize: (?adapter: untyped, ?ssl: untyped, ?hostname: untyped, ?port: untyped, ?uds_path: untyped, ?timeout_seconds: untyped) -> void
 
-          attr_reader adapter: untyped
+          attr_reader adapter: :net_http | :unix
           attr_reader ssl: untyped
           attr_reader hostname: untyped
           attr_reader port: untyped

sig/datadog/core/telemetry/emitter.rbs

@@ -8,7 +8,7 @@ module Datadog
 
         extend Core::Utils::Forking
         def initialize: (http_transport: Datadog::Core::Telemetry::Http::Transport) -> void
-        def request: (Datadog::Core::Telemetry::Event::Base event) -> (Datadog::Core::Telemetry::Http::Adapters::Net::Response | Datadog::Core::Telemetry::Http::InternalErrorResponse)
+        def request: (Datadog::Core::Telemetry::Event::Base event) -> (Datadog::Core::Transport::HTTP::Adapters::Net::Response | Datadog::Core::Transport::InternalErrorResponse)
         def self.sequence: () -> Datadog::Core::Utils::Sequence
       end
     end