httpx 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cad776664fc4cb8f9b6929341526b3de3fbe209ad2a6503ff3ab395c9cd36c7
-  data.tar.gz: 7604391b3c62b09dcb0b8be8ebac19f464133a6cb6bdec6fbbebcef6b9a7ca5f
+  metadata.gz: a0f330c17658b6d488b83008df23e73eb276c04fb93f6e72093224a1a6e1d839
+  data.tar.gz: 75fea2fe69162c00d371ca83f121883d435be3d7d0749f1f2dce71332c6f18d2
 SHA512:
-  metadata.gz: 54a29b0a8ba08f5a66e7fc8070faddcad648ded1fed5be4b3c1992656926bb62baca48a36eb4d7a9d1d3629d7db121900de70630a73e0724fc2a61b7add04740
-  data.tar.gz: bcabd109880e0a56033f504fa67ab907d29c9268ba10a218c672dfe0b1d06404c092a168ae4b1195e1570d442edb3f045129b4d9f6eb15bae24d1e6211d19b63
+  metadata.gz: 4c3bf06316177777f8802fc7662021e565ddc19590a2cad092ab3e05759fa778e7edd4f9b6ee9359b582d8828f669236be517129af57a12d17cfe71cde7adf06
+  data.tar.gz: 66ef58dbd0c3f4681bbde3e211afaaa7272d88aa4aa70e5791636147439a5bacb2bf85f89d0b33a792ddcf6444ae14e3c64685436b9cb849cb7fad30f3db1ef1

data/doc/release_notes/0_24_7.md

@@ -0,0 +1,10 @@
+# 0.24.6
+
+## dependencies
+
+`http-2-next` last supported version for the 0.x series is the last version before v1. This shoul ensure that older versions of `httpx` won't be affected by any of the recent breaking changes.
+
+## Bugfixes
+
+* `grpc`: setup of rpc calls from camel-cased symbols has been fixed. As an improvement, the GRPC-enabled session will now support both snake-cased, as well as camel-cased calls.
+* `datadog` adapter has now been patched to support the most recent breaking changes of `ddtrace` configuration DSL (`env_to_bool` is no longer supported).

data/doc/release_notes/1_0_2.md

@@ -0,0 +1,7 @@
+# 1.0.2
+
+## bugfixes
+
+* bump `http-2-next` to 1.0.1, which fixes a bug where http/2 connection interprets MAX_CONCURRENT_STREAMS as request cap.
+* `grpc`: setup of rpc calls from camel-cased symbols has been fixed. As an improvement, the GRPC-enabled session will now support both snake-cased, as well as camel-cased calls.
+* `datadog` adapter has now been patched to support the most recent breaking changes of `ddtrace` configuration DSL (`env_to_bool` is no longer supported).

data/lib/httpx/adapters/datadog.rb

@@ -126,19 +126,39 @@ module Datadog::Tracing
           option :distributed_tracing, default: true
           option :split_by_domain, default: false
 
-          option :enabled do |o|
-            o.default { env_to_bool("DD_TRACE_HTTPX_ENABLED", true) }
-            o.lazy
-          end
+          if DDTrace::VERSION::STRING >= "1.13.0"
+            option :enabled do |o|
+              o.type :bool
+              o.env "DD_TRACE_HTTPX_ENABLED"
+              o.default true
+            end
 
-          option :analytics_enabled do |o|
-            o.default { env_to_bool(%w[DD_TRACE_HTTPX_ANALYTICS_ENABLED DD_HTTPX_ANALYTICS_ENABLED], false) }
-            o.lazy
-          end
+            option :analytics_enabled do |o|
+              o.type :bool
+              o.env "DD_TRACE_HTTPX_ANALYTICS_ENABLED"
+              o.default false
+            end
+
+            option :analytics_sample_rate do |o|
+              o.type :float
+              o.env "DD_TRACE_HTTPX_ANALYTICS_SAMPLE_RATE"
+              o.default 1.0
+            end
+          else
+            option :enabled do |o|
+              o.default { env_to_bool("DD_TRACE_HTTPX_ENABLED", true) }
+              o.lazy
+            end
 
-          option :analytics_sample_rate do |o|
-            o.default { env_to_float(%w[DD_TRACE_HTTPX_ANALYTICS_SAMPLE_RATE DD_HTTPX_ANALYTICS_SAMPLE_RATE], 1.0) }
-            o.lazy
+            option :analytics_enabled do |o|
+              o.default { env_to_bool(%w[DD_TRACE_HTTPX_ANALYTICS_ENABLED DD_HTTPX_ANALYTICS_ENABLED], false) }
+              o.lazy
+            end
+
+            option :analytics_sample_rate do |o|
+              o.default { env_to_float(%w[DD_TRACE_HTTPX_ANALYTICS_SAMPLE_RATE DD_HTTPX_ANALYTICS_SAMPLE_RATE], 1.0) }
+              o.lazy
+            end
           end
 
           if defined?(Datadog::Tracing::Contrib::SpanAttributeSchema)
@@ -162,7 +182,19 @@ module Datadog::Tracing
 
           option :distributed_tracing, default: true
 
-          option :error_handler, default: DEFAULT_ERROR_HANDLER
+          if DDTrace::VERSION::STRING >= "1.15.0"
+            option :error_handler do |o|
+              o.type :proc
+              o.default_proc(&DEFAULT_ERROR_HANDLER)
+            end
+          elsif DDTrace::VERSION::STRING >= "1.13.0"
+            option :error_handler do |o|
+              o.type :proc
+              o.experimental_default_proc(&DEFAULT_ERROR_HANDLER)
+            end
+          else
+            option :error_handler, default: DEFAULT_ERROR_HANDLER
+          end
         end
       end
 

data/lib/httpx/connection/http1.rb

@@ -7,7 +7,7 @@ module HTTPX
     include Callbacks
     include Loggable
 
-    MAX_REQUESTS = 100
+    MAX_REQUESTS = 200
     CRLF = "\r\n"
 
     attr_reader :pending, :requests

data/lib/httpx/connection/http2.rb

@@ -35,7 +35,7 @@ module HTTPX
       @handshake_completed = false
       @wait_for_handshake = @settings.key?(:wait_for_handshake) ? @settings.delete(:wait_for_handshake) : true
       @max_concurrent_requests = @options.max_concurrent_requests || MAX_CONCURRENT_REQUESTS
-      @max_requests = @options.max_requests || 0
+      @max_requests = @options.max_requests || Float::INFINITY
       init_connection
     end
 
@@ -82,9 +82,7 @@ module HTTPX
     end
 
     def exhausted?
-      return false if @max_requests.zero? && @connection.active_stream_count.zero?
-
-      @connection.active_stream_count >= @max_requests
+      !@max_requests.positive?
     end
 
     def <<(data)
@@ -92,13 +90,9 @@ module HTTPX
     end
 
     def can_buffer_more_requests?
-      if @handshake_completed
+      (@handshake_completed || !@wait_for_handshake) &&
         @streams.size < @max_concurrent_requests &&
-          @streams.size < @max_requests
-      else
-        !@wait_for_handshake &&
-          @streams.size < @max_concurrent_requests
-      end
+        @streams.size < @max_requests
     end
 
     def send(request)
@@ -116,7 +110,6 @@ module HTTPX
       true
     rescue HTTP2Next::Error::StreamLimitExceeded
       @pending.unshift(request)
-      emit(:exhausted)
     end
 
     def consume
@@ -172,7 +165,6 @@ module HTTPX
 
     def init_connection
       @connection = HTTP2Next::Client.new(@settings)
-      @connection.max_streams = @max_requests if @connection.respond_to?(:max_streams=) && @max_requests.positive?
       @connection.on(:frame, &method(:on_frame))
       @connection.on(:frame_sent, &method(:on_frame_sent))
       @connection.on(:frame_received, &method(:on_frame_received))
@@ -340,14 +332,7 @@ module HTTPX
     def on_settings(*)
       @handshake_completed = true
       emit(:current_timeout)
-
-      if @max_requests.zero?
-        @max_requests = @connection.remote_settings[:settings_max_concurrent_streams]
-
-        @connection.max_streams = @max_requests if @connection.respond_to?(:max_streams=) && @max_requests.positive?
-      end
-
-      @max_concurrent_requests = [@max_concurrent_requests, @max_requests].min
+      @max_concurrent_requests = [@max_concurrent_requests, @connection.remote_settings[:settings_max_concurrent_streams]].min
       send_pending
     end
 

data/lib/httpx/plugins/grpc.rb

@@ -149,17 +149,29 @@ module HTTPX
             deadline: @options.grpc_deadline,
           }.merge(opts)
 
+          local_rpc_name = rpc_name.underscore
+
           session_class = Class.new(self.class) do
+            # define rpc method with ruby style name
             class_eval(<<-OUT, __FILE__, __LINE__ + 1)
-              def #{rpc_name}(input, **opts)              # def grpc_action(input, **opts)
-                rpc_execute("#{rpc_name}", input, **opts) #   rpc_execute("grpc_action", input, **opts)
-              end                                         # end
+              def #{local_rpc_name}(input, **opts)              # def grpc_action(input, **opts)
+                rpc_execute("#{local_rpc_name}", input, **opts) #   rpc_execute("grpc_action", input, **opts)
+              end                                               # end
             OUT
+
+            # define rpc method with original name
+            unless local_rpc_name == rpc_name
+              class_eval(<<-OUT, __FILE__, __LINE__ + 1)
+                def #{rpc_name}(input, **opts)                    # def grpcAction(input, **opts)
+                  rpc_execute("#{local_rpc_name}", input, **opts) #   rpc_execute("grpc_action", input, **opts)
+                end                                               # end
+              OUT
+            end
           end
 
           session_class.new(@options.merge(
                               grpc_rpcs: @options.grpc_rpcs.merge(
-                                rpc_name.underscore => [rpc_name, input, output, rpc_opts]
+                                local_rpc_name => [rpc_name, input, output, rpc_opts]
                               ).freeze
                             ))
         end

data/lib/httpx/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-04 00:00:00.000000000 Z
+date: 2023-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 description: A client library for making HTTP requests from Ruby.
 email:
 - cardoso_tiago@hotmail.com
@@ -106,6 +106,7 @@ extra_rdoc_files:
 - doc/release_notes/0_24_4.md
 - doc/release_notes/0_24_5.md
 - doc/release_notes/0_24_6.md
+- doc/release_notes/0_24_7.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md
 - doc/release_notes/0_3_0.md
@@ -129,6 +130,7 @@ extra_rdoc_files:
 - doc/release_notes/0_9_0.md
 - doc/release_notes/1_0_0.md
 - doc/release_notes/1_0_1.md
+- doc/release_notes/1_0_2.md
 files:
 - LICENSE.txt
 - README.md
@@ -206,6 +208,7 @@ files:
 - doc/release_notes/0_24_4.md
 - doc/release_notes/0_24_5.md
 - doc/release_notes/0_24_6.md
+- doc/release_notes/0_24_7.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md
 - doc/release_notes/0_3_0.md
@@ -229,6 +232,7 @@ files:
 - doc/release_notes/0_9_0.md
 - doc/release_notes/1_0_0.md
 - doc/release_notes/1_0_1.md
+- doc/release_notes/1_0_2.md
 - lib/httpx.rb
 - lib/httpx/adapters/datadog.rb
 - lib/httpx/adapters/faraday.rb