httpx 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 125df778093197c9a1fe8872211cf4085a5a885a40536b58501ce1938f8d28ee
-  data.tar.gz: 5a17b5b02212f65ba3472f4dfda96a017fc1ef9a4fb7a3dce85d7b4ac6a8c6bb
+  metadata.gz: 7e9530bb05303e7e15a05a84a26650fc2dd0ec0c35c11c909b07d8deb499f00f
+  data.tar.gz: 29043b781e3f12cf18ca80eeb6979833536b659dd13ce76d5312fe20f3b61342
 SHA512:
-  metadata.gz: b6a4014db970d25a1ac51ea73ac5bd828bf8c0f1012ec778abdf054d9dd6dcfe6cf7fc5f73f915a39d74e4e420329e1293e020d63955601e6f669ae6164a016b
-  data.tar.gz: 96b98469fe6194bbd3427adfd1bfc6032be9c44f2c68ff301a6da20a90741b1979aa194c113a11e1b82cb9a54c3559ef7c35b908d41c10297746e438b557eca3
+  metadata.gz: dea67bc736ed82b32c6c81257d66ca2dac2fae2cf41cb923fdca28c4c9741e5f57b0b56b3bfa23f6b0990f6faf26d14258b296ef771681d405564e02fafaceb5
+  data.tar.gz: 13dda593ac028e1d34b6ca0e22dd6a024705bf542da756a013f5da7f0abcccaab76860e80e5d8586ff95d4fe258542a295c004d33866a7986407c6cd4950f9e9

data/doc/release_notes/1_7_5.md

@@ -0,0 +1,10 @@
+# 1.7.5
+
+## Improvements
+
+* `:tracing` plugin: make `Request#init_time` a UTC timestamp.
+
+## Bugfixes
+
+* fixed handling of conditional responses which was making a batch of concurrent requests being handled serially after they failed.
+* `datadog` adapter: use `Request#init_time` as the span start time, which will fix the bug where the span wasn't including the time it takes to open the connection (TCP/TLS handhshakes).

data/lib/httpx/adapters/datadog.rb

@@ -51,7 +51,7 @@ module Datadog::Tracing
           end
 
           def start(request)
-            request.datadog_span = initialize_span(request, now)
+            request.datadog_span = initialize_span(request, request.init_time)
           end
 
           def reset(request)
@@ -132,10 +132,6 @@ module Datadog::Tracing
           Datadog.logger.error(e.backtrace)
           end
 
-          def now
-            ::Datadog::Core::Utils::Time.now.utc
-          end
-
           def configuration(request)
             Datadog.configuration.tracing[:httpx, request.uri.host]
           end

data/lib/httpx/plugins/expect.rb

@@ -70,6 +70,9 @@ module HTTPX
       module RequestMethods
         def initialize(*)
           super
+
+          @informational_status = nil
+
           return if @body.empty?
 
           threshold = @options.expect_threshold_size

data/lib/httpx/plugins/tracing.rb

@@ -89,7 +89,7 @@ module HTTPX::Plugins
         on(:headers) do
           # the usual request init time (when not including the connection handshake)
           # should be the time the request is buffered the first time.
-          @init_time ||= ::Time.now
+          @init_time ||= ::Time.now.utc
 
           tracer.start(self)
         end
@@ -102,7 +102,7 @@ module HTTPX::Plugins
         # 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 ||= ::Time.now
+        @init_time ||= ::Time.now.utc
 
         super
       end
@@ -113,7 +113,7 @@ module HTTPX::Plugins
       def initialize(*)
         super
 
-        @init_time = ::Time.now
+        @init_time = ::Time.now.utc
       end
 
       def send(request)
@@ -129,7 +129,7 @@ module HTTPX::Plugins
 
         # time of initial request(s) is accounted from the moment
         # the connection is back to :idle, and ready to connect again.
-        @init_time = ::Time.now
+        @init_time = ::Time.now.utc
       end
     end
   end

data/lib/httpx/selector.rb

@@ -29,7 +29,7 @@ module HTTPX
 
     def_delegator :@timers, :after
 
-    def_delegator :@selectables, :empty?
+    def_delegator :@selectables, :each
 
     def initialize
       @timers = Timers.new
@@ -37,8 +37,8 @@ module HTTPX
       @is_timer_interval = false
     end
 
-    def each(&blk)
-      @selectables.each(&blk)
+    def empty?
+      @selectables.empty? && @timers.empty?
     end
 
     def next_tick

data/lib/httpx/session.rb

@@ -325,53 +325,34 @@ module HTTPX
 
     # returns the array of HTTPX::Response objects corresponding to the array of HTTPX::Request +requests+.
     def receive_requests(requests, selector)
-      responses = [] # : Array[response]
-
-      # guarantee ordered responses
-      loop do
-        request = requests.first
-
-        return responses unless request
-
-        catch(:coalesced) { selector.next_tick } until (response = fetch_response(request, selector, request.options))
-        request.complete!(response)
-
-        responses << response
-        requests.shift
-
-        break if requests.empty?
+      waiting = 0
+      responses = requests.map do |request|
+        fetch_response(request, selector, request.options).tap do |response|
+          waiting += 1 if response.nil?
+        end
+      end
 
-        next unless selector.empty?
+      until waiting.zero? || selector.empty?
+        # loop on selector until at least one response has been received.
+        catch(:coalesced) { selector.next_tick }
 
-        # in some cases, the pool of connections might have been drained because there was some
-        # handshake error, and the error responses have already been emitted, but there was no
-        # opportunity to traverse the requests, hence we're returning only a fraction of the errors
-        # we were supposed to. This effectively fetches the existing responses and return them.
-        exit_from_loop = true
+        responses.each_with_index do |response, idx|
+          next unless response.nil?
 
-        requests_to_remove = [] # : Array[Request]
+          request = requests[idx]
 
-        requests.each do |req|
-          response = fetch_response(req, selector, request.options)
+          response = fetch_response(request, selector, request.options)
 
-          if exit_from_loop && response
-            req.complete!(response)
-            responses << response
-            requests_to_remove << req
-          else
-            # fetch_response may resend requests. when that happens, we need to go back to the initial
-            # loop and process the selector. we still do a pass-through on the remainder of requests, so
-            # that every request that need to be resent, is resent.
-            exit_from_loop = false
+          next unless response
 
-            raise Error, "something went wrong, responses not found and requests not resent" if selector.empty?
-          end
+          request.complete!(response)
+          responses[idx] = response
+          waiting -= 1
         end
+      end
 
-        break if exit_from_loop
+      raise Error, "something went wrong, responses not found and requests not resent" unless waiting.zero?
 
-        requests -= requests_to_remove
-      end
       responses
     end
 

data/lib/httpx/timers.rb

@@ -6,6 +6,10 @@ module HTTPX
       @intervals = []
     end
 
+    def empty?
+      @intervals.empty?
+    end
+
     def after(interval_in_secs, cb = nil, &blk)
       callback = cb || blk
 

data/lib/httpx/version.rb

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

data/sig/plugins/expect.rbs

@@ -20,6 +20,10 @@ module HTTPX
         def delete: (String host) -> void
       end
 
+      module RequestMethods
+        @informational_status: Integer?
+      end
+
       interface _ExpectOptions
         def expect_timeout: () -> Integer?
 

data/sig/plugins/fiber_concurrency.rbs

@@ -9,12 +9,12 @@ module HTTPX
 
         def set_context!: () -> void
 
-        def current_context?: () -> bool
+        def current_context?: () -> boolish
       end
 
       module ConnectionMethods
 
-        def current_context?: () -> bool
+        def current_context?: () -> boolish
 
         def send: (request request) -> void
       end

data/sig/selector.rbs

@@ -24,8 +24,6 @@ module HTTPX
 
     type io_select_selectable = (selectable | Array[selectable])?
 
-    include _Each[selectable]
-
     extend Forwardable
 
     READABLE: Array[io_interests]
@@ -36,6 +34,9 @@ module HTTPX
     @selectables: Array[selectable]
     @is_timer_interval: bool
 
+    def each: () -> ::Enumerator[selectable, self]
+            | () { (selectable) -> void } -> self
+
     def next_tick: () -> void
 
     def terminate: () -> void

data/sig/timers.rbs

@@ -14,6 +14,8 @@ module HTTPX
 
     def initialize: () -> void
 
+    def empty?: () -> bool
+
     private
 
     def drop_elapsed!: (Numeric elapsed_time) -> void

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -164,6 +164,7 @@ extra_rdoc_files:
 - doc/release_notes/1_7_2.md
 - doc/release_notes/1_7_3.md
 - doc/release_notes/1_7_4.md
+- doc/release_notes/1_7_5.md
 files:
 - LICENSE.txt
 - README.md
@@ -300,6 +301,7 @@ files:
 - doc/release_notes/1_7_2.md
 - doc/release_notes/1_7_3.md
 - doc/release_notes/1_7_4.md
+- doc/release_notes/1_7_5.md
 - lib/httpx.rb
 - lib/httpx/adapters/datadog.rb
 - lib/httpx/adapters/faraday.rb