httpx 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 947d1ad4fd269f30707292be54687f7be2054147fb3fa471c76395e92c55820e
-  data.tar.gz: d6e321ace4211e8bf8215eff799b5c98aad627990db5b9b2cc091fe5b1b95df7
+  metadata.gz: 7c039169fa319d4e42cff7cb34d8a9cc7fc571e62565f673c32436645780222c
+  data.tar.gz: 6affb65b4fa71aa813cffc498034e0c6a6609bcdb0fca9d0ae9df738d4786d1d
 SHA512:
-  metadata.gz: bd87db725b6da121b79f266a8a309816f5afea4ec1890a14720c16a667ea32632fdbdd9d74249b337672315fd2ac16c1488d8aa13f4e031b33751e1625f2c9a5
-  data.tar.gz: 00027b822dff3985519aba56eb7b3bd28d0d81eacbdeb9d49f6e778023d60ae3eaf1a2469cf11287da12c0dde2a23b1557da33e77310ea6733e03e4f73b822e2
+  metadata.gz: 21be43709d51f7c50d1624923bc1657c9f096b84686612ff70f660af320d71d94d28a52ccef05f27558d74f22e1fd307944ca8ddf8b6c74c0b322e83eaad9b19
+  data.tar.gz: c551d2b32a71c5bbf099283b3577abe80d5005f702af5edefb79f445296c37c8fb9afb3d52b18db254a0c4ddd115d5f45953549f9b3c99c90ff8b86aedd6cb91

data/doc/release_notes/1_6_2.md

@@ -0,0 +1,11 @@
+# 1.6.2
+
+## Bugfixes
+
+* revert of behaviour introduced in 1.6.1 around handling of `:ip_families` for name resolution.
+  * when no option is passed, do not assume no IPv6 connectivity if no available non-local IP is found, as the local network may still be reachable under `[::]`.
+* bail out connection if the tcp connection was established but the ssl session failed.
+  * when alpn negotiation succeeded, this could still initialize the HTTP/2 connection and put bytes in the buffer, which would cause a busy loop trying to write to a non-open socket.
+* datadog: fix initialization of spans in non-connection related errors
+  * past code was relying on the error being around DNS, but other errors could pop; the fix was moving the init time setup early to the session, when a request is first passed ot the associated connection.
+  * it can also fail earlier, so provide a workaround for that as well.

data/lib/httpx/adapters/datadog.rb

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

data/lib/httpx/connection.rb

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

data/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 || Resolver.supported_ip_families
+      ip_families = connection.options.ip_families
 
       resolved = false
       addresses.group_by(&:family).sort { |(f1, _), (f2, _)| f2 <=> f1 }.each do |family, addrs|
-        next unless ip_families.include?(family)
+        next unless ip_families.nil? || 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,11 +91,7 @@ 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?
 

data/lib/httpx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTPX
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -157,6 +157,7 @@ extra_rdoc_files:
 - doc/release_notes/1_5_1.md
 - doc/release_notes/1_6_0.md
 - doc/release_notes/1_6_1.md
+- doc/release_notes/1_6_2.md
 files:
 - LICENSE.txt
 - README.md
@@ -286,6 +287,7 @@ files:
 - doc/release_notes/1_5_1.md
 - doc/release_notes/1_6_0.md
 - doc/release_notes/1_6_1.md
+- doc/release_notes/1_6_2.md
 - lib/httpx.rb
 - lib/httpx/adapters/datadog.rb
 - lib/httpx/adapters/faraday.rb