httpx 0.19.5 → 0.19.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dbbe59cf004c889830daa1a45b0111eb4e04e7447fc0e94bca9ae7041d99770
-  data.tar.gz: 95acfba594d42b96a41e0d18d682f5873cbe57e1e394d62d76ce7be1463741ad
+  metadata.gz: 05a379db82c9c86f84a847680f4a784ed62a4cbcb8ce8d09a3d3c29abeb7d5d1
+  data.tar.gz: 5046f5d1e86f7d5c523a171b23fd5fb8126b63636a021c204a7c33a4ebf5e319
 SHA512:
-  metadata.gz: 401ee8e3e4c1eb92a454a9debb73d3f1c7d1f119ba757e5a2534b4d2b7a39c2608b7ef91f95fc74ec50dfa7db1faa25aadf4b57d2e8c9f58f5c65e01f98dc234
-  data.tar.gz: 937d4b05a7ee6b3da3cdce1e98e3c389dc3eed82cc29a278dfb3d7c0d7907e795421caaec00f2a95112d99deb13fcfe1d81a70c291d0f00dd862021cbe036583
+  metadata.gz: d62d606f0688c485f79a38feed6b94841005fb6a70c5ab934c7b70cb7a7958066b85a496405959a7660da3f12f194d844f10660621ce6fb98c7aa898c38d855c
+  data.tar.gz: 42b46c44c4c864222f14235534be31db4eb5155716c542457178be010b227fdb391c095b009759e9c237d6320da7133123334cfc4b3d4dd6940ff58aa6df9f0e

data/doc/release_notes/0_19_6.md

@@ -0,0 +1,5 @@
+# 0.19.6
+
+## Bugfixes
+
+* fixed the root cause of the `faraday` adapter failing when used alongside the `webmock` integration.

data/doc/release_notes/0_19_7.md

@@ -0,0 +1,5 @@
+# 0.19.7
+
+## Bugfixes
+
+* fix: in `:proxy` plugin, user/pass credentials were not being used when passed as options (only when embedded in the URL). This was a regression introduced in the 0.19.x series.

data/doc/release_notes/0_19_8.md

@@ -0,0 +1,5 @@
+# 0.19.7
+
+## Bugfixes
+
+* `datadog` went v1, which broke `httpx` adapter. Now it supports both 1.0 and 0.x versions.

data/lib/httpx/adapters/datadog.rb

@@ -1,12 +1,52 @@
 # frozen_string_literal: true
 
-require "ddtrace/contrib/integration"
-require "ddtrace/contrib/rest_client/configuration/settings"
-require "ddtrace/contrib/rest_client/patcher"
+if defined?(::DDTrace) && ::DDTrace::VERSION::STRING >= "1.0.0"
+  require "datadog/tracing/contrib/integration"
+  require "datadog/tracing/contrib/configuration/settings"
+  require "datadog/tracing/contrib/patcher"
 
-module Datadog
+  TRACING_MODULE = Datadog::Tracing
+else
+
+  require "ddtrace/contrib/integration"
+  require "ddtrace/contrib/configuration/settings"
+  require "ddtrace/contrib/patcher"
+
+  TRACING_MODULE = Datadog
+end
+
+module TRACING_MODULE # rubocop:disable Naming/ClassAndModuleCamelCase
   module Contrib
     module HTTPX
+      if defined?(::DDTrace) && ::DDTrace::VERSION::STRING >= "1.0.0"
+        METADATA_MODULE = TRACING_MODULE::Metadata
+
+        TYPE_OUTBOUND = TRACING_MODULE::Metadata::Ext::HTTP::TYPE_OUTBOUND
+
+        TAG_PEER_SERVICE = TRACING_MODULE::Metadata::Ext::TAG_PEER_SERVICE
+
+        TAG_URL = TRACING_MODULE::Metadata::Ext::HTTP::TAG_URL
+        TAG_METHOD = TRACING_MODULE::Metadata::Ext::HTTP::TAG_METHOD
+        TAG_TARGET_HOST = TRACING_MODULE::Metadata::Ext::NET::TAG_TARGET_HOST
+        TAG_TARGET_PORT = TRACING_MODULE::Metadata::Ext::NET::TAG_TARGET_PORT
+
+        TAG_STATUS_CODE = TRACING_MODULE::Metadata::Ext::HTTP::TAG_STATUS_CODE
+
+      else
+
+        METADATA_MODULE = Datadog
+
+        TYPE_OUTBOUND = TRACING_MODULE::Ext::HTTP::TYPE_OUTBOUND
+        TAG_PEER_SERVICE = TRACING_MODULE::Ext::Integration::TAG_PEER_SERVICE
+        TAG_URL = TRACING_MODULE::Ext::HTTP::URL
+        TAG_METHOD = TRACING_MODULE::Ext::HTTP::METHOD
+        TAG_TARGET_HOST = TRACING_MODULE::Ext::NET::TARGET_HOST
+        TAG_TARGET_PORT = TRACING_MODULE::Ext::NET::TARGET_PORT
+        TAG_STATUS_CODE = Datadog::Ext::HTTP::STATUS_CODE
+        PROPAGATOR = TRACING_MODULE::HTTPPropagator
+
+      end
+
       # HTTPX Datadog Plugin
       #
       # Enables tracing for httpx requests. A span will be created for each individual requests,
@@ -15,6 +55,8 @@ module Datadog
       #
       module Plugin
         class RequestTracer
+          include Contrib::HttpAnnotationHelper
+
           SPAN_REQUEST = "httpx.request"
 
           def initialize(request)
@@ -22,43 +64,37 @@ module Datadog
           end
 
           def call
-            return if skip_tracing?
+            return unless tracing_enabled?
 
             @request.on(:response, &method(:finish))
 
             verb = @request.verb.to_s.upcase
             uri = @request.uri
 
-            @span = datadog_pin.tracer.trace(SPAN_REQUEST)
-            service_name = datadog_config[:split_by_domain] ? uri.host : datadog_pin.service_name
+            @span = build_span
 
-            begin
-              @span.service = service_name
-              @span.span_type = Datadog::Ext::HTTP::TYPE_OUTBOUND
-              @span.resource = verb
+            @span.resource = verb
 
-              Datadog::HTTPPropagator.inject!(@span.context, @request.headers) if datadog_pin.tracer.enabled && !skip_distributed_tracing?
+            # Add additional request specific tags to the span.
 
-              # Add additional request specific tags to the span.
+            @span.set_tag(TAG_URL, @request.path)
+            @span.set_tag(TAG_METHOD, verb)
 
-              @span.set_tag(Datadog::Ext::HTTP::URL, @request.path)
-              @span.set_tag(Datadog::Ext::HTTP::METHOD, verb)
+            @span.set_tag(TAG_TARGET_HOST, uri.host)
+            @span.set_tag(TAG_TARGET_PORT, uri.port.to_s)
 
-              @span.set_tag(Datadog::Ext::NET::TARGET_HOST, uri.host)
-              @span.set_tag(Datadog::Ext::NET::TARGET_PORT, uri.port.to_s)
+            # Tag as an external peer service
+            @span.set_tag(TAG_PEER_SERVICE, @span.service)
 
-              # Tag as an external peer service
-              @span.set_tag(Datadog::Ext::Integration::TAG_PEER_SERVICE, @span.service)
+            propagate_headers if @configuration[:distributed_tracing]
 
-              # Set analytics sample rate
-              if Contrib::Analytics.enabled?(datadog_config[:analytics_enabled])
-                Contrib::Analytics.set_sample_rate(@span, datadog_config[:analytics_sample_rate])
-              end
-            rescue StandardError => e
-              Datadog.logger.error("error preparing span for http request: #{e}")
+            # Set analytics sample rate
+            if Contrib::Analytics.enabled?(@configuration[:analytics_enabled])
+              Contrib::Analytics.set_sample_rate(@span, @configuration[:analytics_sample_rate])
             end
           rescue StandardError => e
-            Datadog.logger.debug("Failed to start span: #{e}")
+            Datadog.logger.error("error preparing span for http request: #{e}")
+            Datadog.logger.error(e.backtrace)
           end
 
           def finish(response)
@@ -67,7 +103,7 @@ module Datadog
             if response.is_a?(::HTTPX::ErrorResponse)
               @span.set_error(response.error)
             else
-              @span.set_tag(Datadog::Ext::HTTP::STATUS_CODE, response.status.to_s)
+              @span.set_tag(TAG_STATUS_CODE, response.status.to_s)
 
               @span.set_error(::HTTPX::HTTPError.new(response)) if response.status >= 400 && response.status <= 599
             end
@@ -77,40 +113,48 @@ module Datadog
 
           private
 
-          def skip_tracing?
-            return true if @request.headers.key?(Datadog::Ext::Transport::HTTP::HEADER_META_TRACER_VERSION)
-
-            return false unless @datadog_pin
-
-            span = @datadog_pin.tracer.active_span
+          if defined?(::DDTrace) && ::DDTrace::VERSION::STRING >= "1.0.0"
 
-            return true if span && (span.name == SPAN_REQUEST)
+            def build_span
+              TRACING_MODULE.trace(
+                SPAN_REQUEST,
+                service: service_name(@request.uri.host, configuration, Datadog.configuration_for(self)),
+                span_type: TYPE_OUTBOUND
+              )
+            end
 
-            false
-          end
+            def propagate_headers
+              TRACING_MODULE::Propagation::HTTP.inject!(TRACING_MODULE.active_trace, @request.headers)
+            end
 
-          def skip_distributed_tracing?
-            return !datadog_pin.config[:distributed_tracing] if datadog_pin.config && datadog_pin.config.key?(:distributed_tracing)
+            def configuration
+              @configuration ||= Datadog.configuration.tracing[:httpx, @request.uri.host]
+            end
 
-            !Datadog.configuration[:httpx][:distributed_tracing]
-          end
+            def tracing_enabled?
+              TRACING_MODULE.enabled?
+            end
+          else
+            def build_span
+              service_name = configuration[:split_by_domain] ? @request.uri.host : configuration[:service_name]
+              configuration[:tracer].trace(
+                SPAN_REQUEST,
+                service: service_name,
+                span_type: TYPE_OUTBOUND
+              )
+            end
 
-          def datadog_pin
-            @datadog_pin ||= begin
-              service = datadog_config[:service_name]
-              tracer = datadog_config[:tracer]
+            def propagate_headers
+              Datadog::HTTPPropagator.inject!(@span.context, @request.headers)
+            end
 
-              Datadog::Pin.new(
-                service,
-                app: "httpx",
-                app_type: Datadog::Ext::AppTypes::WEB,
-                tracer: -> { tracer }
-              )
+            def configuration
+              @configuration ||= Datadog.configuration[:httpx, @request.uri.host]
             end
-          end
 
-          def datadog_config
-            @datadog_config ||= Datadog.configuration[:httpx, @request.uri.host]
+            def tracing_enabled?
+              configuration[:tracer].enabled
+            end
           end
         end
 
@@ -125,7 +169,11 @@ module Datadog
       module Configuration
         # Default settings for httpx
         #
-        class Settings < Datadog::Contrib::Configuration::Settings
+        class Settings < TRACING_MODULE::Contrib::Configuration::Settings
+          DEFAULT_ERROR_HANDLER = lambda do |response|
+            Datadog::Ext::HTTP::ERROR_RANGE.cover?(response.status)
+          end
+
           option :service_name, default: "httpx"
           option :distributed_tracing, default: true
           option :split_by_domain, default: false
@@ -145,14 +193,14 @@ module Datadog
             o.lazy
           end
 
-          option :error_handler, default: Datadog::Tracer::DEFAULT_ON_ERROR
+          option :error_handler, default: DEFAULT_ERROR_HANDLER
         end
       end
 
       # Patcher enables patching of 'httpx' with datadog components.
       #
       module Patcher
-        include Datadog::Contrib::Patcher
+        include TRACING_MODULE::Contrib::Patcher
 
         module_function
 
@@ -192,8 +240,14 @@ module Datadog
           super && version >= MINIMUM_VERSION
         end
 
-        def default_configuration
-          Configuration::Settings.new
+        if defined?(::DDTrace) && ::DDTrace::VERSION::STRING >= "1.0.0"
+          def new_configuration
+            Configuration::Settings.new
+          end
+        else
+          def default_configuration
+            Configuration::Settings.new
+          end
         end
 
         def patcher

data/lib/httpx/adapters/faraday.rb

@@ -99,33 +99,31 @@ module Faraday
         end
       end
 
-      class Session < ::HTTPX::Session
-        plugin(:compression)
-        plugin(:persistent)
-
-        module ReasonPlugin
+      module ReasonPlugin
+        if RUBY_VERSION < "2.5"
+          def self.load_dependencies(*)
+            require "webrick"
+          end
+        else
+          def self.load_dependencies(*)
+            require "net/http/status"
+          end
+        end
+        module ResponseMethods
           if RUBY_VERSION < "2.5"
-            def self.load_dependencies(*)
-              require "webrick"
+            def reason
+              WEBrick::HTTPStatus::StatusMessage.fetch(@status)
             end
           else
-            def self.load_dependencies(*)
-              require "net/http/status"
-            end
-          end
-          module ResponseMethods
-            if RUBY_VERSION < "2.5"
-              def reason
-                WEBrick::HTTPStatus::StatusMessage.fetch(@status)
-              end
-            else
-              def reason
-                Net::HTTP::STATUS_CODES.fetch(@status)
-              end
+            def reason
+              Net::HTTP::STATUS_CODES.fetch(@status)
             end
           end
         end
-        plugin(ReasonPlugin)
+      end
+
+      def self.session
+        @session ||= ::HTTPX.plugin(:compression).plugin(:persistent).plugin(ReasonPlugin)
       end
 
       class ParallelManager
@@ -161,7 +159,6 @@ module Faraday
         include RequestMixin
 
         def initialize
-          @session = Session.new
           @handlers = []
         end
 
@@ -174,7 +171,7 @@ module Faraday
         def run
           env = @handlers.last.env
 
-          session = @session.with(options_from_env(env))
+          session = HTTPX.session.with(options_from_env(env))
           session = session.plugin(:proxy).with(proxy: { uri: env.request.proxy }) if env.request.proxy
           session = session.plugin(OnDataPlugin) if env.request.stream_response?
 
@@ -205,7 +202,7 @@ module Faraday
 
       def initialize(app, options = {})
         super(app)
-        @session = Session.new(options)
+        @session_options = options
       end
 
       def call(env)
@@ -221,7 +218,9 @@ module Faraday
           return handler
         end
 
-        session = @session.with(options_from_env(env))
+        session = HTTPX.session
+        session = session.with(@session_options) unless @session_options.empty?
+        session = session.with(options_from_env(env))
         session = session.plugin(:proxy).with(proxy: { uri: env.request.proxy }) if env.request.proxy
         session = session.plugin(OnDataPlugin) if env.request.stream_response?
 

data/lib/httpx/plugins/proxy.rb

@@ -81,7 +81,11 @@ module HTTPX
             end
             uris
           end
-          { uri: @_proxy_uris.first } unless @_proxy_uris.empty?
+          return if @_proxy_uris.empty?
+
+          proxy_opts = { uri: @_proxy_uris.first }
+          proxy_opts = options.proxy.merge(proxy_opts) if options.proxy
+          proxy_opts
         end
 
         def find_connection(request, connections, options)

data/lib/httpx/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.19.5
+  version: 0.19.8
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next
@@ -76,6 +76,9 @@ extra_rdoc_files:
 - doc/release_notes/0_19_3.md
 - doc/release_notes/0_19_4.md
 - doc/release_notes/0_19_5.md
+- doc/release_notes/0_19_6.md
+- doc/release_notes/0_19_7.md
+- doc/release_notes/0_19_8.md
 - doc/release_notes/0_1_0.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md
@@ -145,6 +148,9 @@ files:
 - doc/release_notes/0_19_3.md
 - doc/release_notes/0_19_4.md
 - doc/release_notes/0_19_5.md
+- doc/release_notes/0_19_6.md
+- doc/release_notes/0_19_7.md
+- doc/release_notes/0_19_8.md
 - doc/release_notes/0_1_0.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md