lib/httpx/adapters/datadog.rb

@@ -180,7 +180,7 @@ module Datadog::Tracing
         end
 
         module RequestMethods
-          attr_accessor :init_time
+          attr_reader :init_time
 
           # intercepts request initialization to inject the tracing logic.
           def initialize(*)
@@ -193,30 +193,26 @@ module Datadog::Tracing
             RequestTracer.call(self)
           end
 
-          def response=(*)
+          def response=(response)
-            # init_time should be set when it's send to a connection.
+            if response.is_a?(::HTTPX::ErrorResponse) && response.error.respond_to?(:connection)
-            # However, there are situations where connection initialization fails.
+              # handles the case when the +error+ happened during name resolution, which means
-            # Example is the :ssrf_filter plugin, which raises an error on
+              # that the tracing start point hasn't been triggered yet; in such cases, the approximate
-            # initialize if the host is an IP which matches against the known set.
+              # initial resolving time is collected from the connection, and used as span start time,
-            # in such cases, we'll just set here right here.
+              # and the tracing object in inserted before the on response callback is called.
-            @init_time ||= ::Datadog::Core::Utils::Time.now.utc
+              @init_time = response.error.connection.init_time
-
+            end
             super
           end
         end
 
         module ConnectionMethods
+          attr_reader :init_time
+
           def initialize(*)
             super
 
             @init_time = ::Datadog::Core::Utils::Time.now.utc
           end
-
-          def send(request)
-            request.init_time ||= @init_time
-
-            super
-          end
         end
       end
 

lib/httpx/connection.rb

@@ -243,10 +243,6 @@ module HTTPX
       case @state
       when :idle
         connect
-
-        # when opening the tcp or ssl socket fails
-        return if @state == :closed
-
         consume
       when :closed
         return

lib/httpx/resolver/multi.rb

@@ -69,11 +69,11 @@ module HTTPX
       addresses = @resolver_options[:cache] && (connection.addresses || HTTPX::Resolver.nolookup_resolve(hostname))
       return false unless addresses
 
-      ip_families = connection.options.ip_families
+      ip_families = connection.options.ip_families || Resolver.supported_ip_families
 
       resolved = false
       addresses.group_by(&:family).sort { |(f1, _), (f2, _)| f2 <=> f1 }.each do |family, addrs|
-        next unless ip_families.nil? || ip_families.include?(family)
+        next unless ip_families.include?(family)
 
         # try to match the resolver by family. However, there are cases where that's not possible, as when
         # the system does not have IPv6 connectivity, but it does support IPv6 via loopback/link-local.
@@ -91,7 +91,11 @@ module HTTPX
     end
 
     def lazy_resolve(connection)
+      ip_families = connection.options.ip_families || Resolver.supported_ip_families
+
       @resolvers.each do |resolver|
+        next unless ip_families.include?(resolver.family)
+
         resolver << @current_session.try_clone_connection(connection, @current_selector, resolver.family)
         next if resolver.empty?