httpx 0.22.3 → 0.22.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39a428f7a8a6747513b56a5e2b4216569363b71baa273d1904b3805f6385e1aa
-  data.tar.gz: 900178247910015b23dcc199df570dadde117d3837efecc5b7100e6478054a77
+  metadata.gz: 1346874cf311c485468e6c99054806adfde48a145d9b012a9a2a2e56a9ae3a8b
+  data.tar.gz: 4b345ffef12d65d66787e59bc3ed8c01619a343246ddd433a1a0e807029f14de
 SHA512:
-  metadata.gz: 77d450b37b3dacbc998b4a659d2ddfe80ae0fcf38cbbad79a2ab8df10522f0cc69e57979960559503bd9a00eb775b1e664f3ada81d8aaad0a1ae29765ff4868c
-  data.tar.gz: 40d9e2b9cb187f0610d5985128227aedc6ed2c3cde55adcb69e6abd20fd9048d96fb05357e320bdb90442bb3553cacca5aa0368e5455344034d654c902412318
+  metadata.gz: 6dfa20f805f0421917c6aee58ff2bedb31173d4b227fa76c6b23d1af9ee903242f26ab12474907400d5e6dae7b0fe4084c771689e4e6391ff6227277a7beef9b
+  data.tar.gz: 7d8a89d569f0b8abc775eae0563450e1e9470c7a74cd7aa249abc49570901f6ceb0548ba5236b1575ba17e9f8a17c433cea12a1708a9df3b520c599304bcd458

data/doc/release_notes/0_22_4.md

@@ -0,0 +1,6 @@
+# 0.22.4
+
+## Bugfixes
+
+* fix happy eyeballs v2 bug where, once the first connection would be established, the remaining one would still end up in the coalescing loop, thereby closing itself via the `:tcp_open` callback.
+* fix for faraday plugin parallel mode, where it'd hang if no requests would be made in the parallel block (@catlee)

data/doc/release_notes/0_22_5.md

@@ -0,0 +1,6 @@
+# 0.22.5
+
+## Bugfixes
+
+* `datadog` and `sentry` integrations did not account for `Connection#send` being possibly called multiple times (something possible for connection coalescing, max requests exhaustion, or Happy Eyeballs 2), and were registering multiple `on(:response)` callbacks. Requests are now marked when decorated the first time.
+* Happy Eyeballs handshake "connect errors" routine is now taking both name resolution errors, as well as TLS handshake errors, into account, when the handshake fails.

data/lib/httpx/adapters/datadog.rb

@@ -158,9 +158,19 @@ module TRACING_MODULE # rubocop:disable Naming/ClassAndModuleCamelCase
           end
         end
 
+        module RequestMethods
+          def __datadog_enable_trace!
+            return super if @__datadog_enable_trace
+
+            RequestTracer.new(self).call
+            @__datadog_enable_trace = true
+          end
+        end
+
         module ConnectionMethods
           def send(request)
-            RequestTracer.new(request).call
+            request.__datadog_enable_trace!
+
             super
           end
         end

data/lib/httpx/adapters/faraday.rb

@@ -169,6 +169,8 @@ module Faraday
         end
 
         def run
+          return unless @handlers.last
+
           env = @handlers.last.env
 
           session = HTTPX.session.with(options_from_env(env))

data/lib/httpx/adapters/sentry.rb

@@ -89,9 +89,19 @@ module HTTPX::Plugins
       end
     end
 
+    module RequestMethods
+      def __sentry_enable_trace!
+        return super if @__sentry_enable_trace
+
+        Tracer.call(self)
+        @__sentry_enable_trace = true
+      end
+    end
+
     module ConnectionMethods
       def send(request)
-        Tracer.call(request)
+        request.__sentry_enable_trace!
+
         super
       end
     end

data/lib/httpx/callbacks.rb

@@ -22,12 +22,12 @@ module HTTPX
       callbacks(type).delete_if { |pr| :delete == pr.call(*args) } # rubocop:disable Style/YodaCondition
     end
 
-    protected
-
     def callbacks_for?(type)
-      @callbacks.key?(type) && !@callbacks[type].empty?
+      @callbacks.key?(type) && @callbacks[type].any?
     end
 
+    protected
+
     def callbacks(type = nil)
       return @callbacks unless type
 

data/lib/httpx/connection.rb

@@ -538,12 +538,13 @@ module HTTPX
       # connect errors, exit gracefully
       error = ConnectionError.new(e.message)
       error.set_backtrace(e.backtrace)
-      connecting? && callbacks(:connect_error).any? ? emit(:connect_error, error) : handle_error(error)
+      connecting? && callbacks_for?(:connect_error) ? emit(:connect_error, error) : handle_error(error)
       @state = :closed
       emit(:close)
     rescue TLSError => e
       # connect errors, exit gracefully
       handle_error(e)
+      connecting? && callbacks_for?(:connect_error) ? emit(:connect_error, e) : handle_error(e)
       @state = :closed
       emit(:close)
     end

data/lib/httpx/pool.rb

@@ -141,21 +141,25 @@ module HTTPX
       connection.once(:connect_error) do |err|
         if new_connection.connecting?
           new_connection.merge(connection)
+          connection.force_reset
         else
-          connection.handle_error(err)
+          connection.__send__(:handle_error, err)
         end
       end
 
       new_connection.once(:tcp_open) do |new_conn|
-        new_conn.merge(connection)
-        connection.force_reset
+        if new_conn != connection
+          new_conn.merge(connection)
+          connection.force_reset
+        end
       end
       new_connection.once(:connect_error) do |err|
         if connection.connecting?
           # main connection has the requests
           connection.merge(new_connection)
+          new_connection.force_reset
         else
-          new_connection.handle_error(err)
+          new_connection.__send__(:handle_error, err)
         end
       end
 
@@ -181,6 +185,8 @@ module HTTPX
     end
 
     def on_resolver_error(connection, error)
+      return connection.emit(:connect_error, error) if connection.connecting? && connection.callbacks_for?(:connect_error)
+
       connection.emit(:error, error)
     end
 

data/lib/httpx/resolver/multi.rb

@@ -64,12 +64,7 @@ module HTTPX
     end
 
     def on_resolver_error(connection, error)
-      @errors[connection] << error
-
-      return unless @errors[connection].size >= @resolvers.size
-
-      errors = @errors.delete(connection)
-      emit(:error, connection, errors.first)
+      emit(:error, connection, error)
     end
 
     def on_resolver_close(resolver)

data/lib/httpx/transcoder.rb

@@ -73,7 +73,7 @@ module HTTPX
     end
 
     def params_hash_has_key?(hash, key)
-      return false if /\[\]/.match?(key)
+      return false if key.include?("[]")
 
       key.split(/[\[\]]+/).inject(hash) do |h, part|
         next h if part == ""

data/lib/httpx/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.22.3
+  version: 0.22.5
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 2023-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next
@@ -92,6 +92,8 @@ extra_rdoc_files:
 - doc/release_notes/0_22_1.md
 - doc/release_notes/0_22_2.md
 - doc/release_notes/0_22_3.md
+- doc/release_notes/0_22_4.md
+- doc/release_notes/0_22_5.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md
 - doc/release_notes/0_3_0.md
@@ -176,6 +178,8 @@ files:
 - doc/release_notes/0_22_1.md
 - doc/release_notes/0_22_2.md
 - doc/release_notes/0_22_3.md
+- doc/release_notes/0_22_4.md
+- doc/release_notes/0_22_5.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md
 - doc/release_notes/0_3_0.md