opentelemetry-instrumentation-faraday 0.24.8 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d77c32dd025abec6065c2178b3bb4f5b8b1e30f8346c144c90a69f842fe0e94
-  data.tar.gz: d2b7de74cb08ba24ea51979f8766b357255ce9154d71cb9fcf4cbc28d074bd06
+  metadata.gz: ef531ecfdcc07ba765a21743d3787b8d6de244b2b371241cd5121d775c7c679b
+  data.tar.gz: 33df6f2dd61589ffdf001c3577679f944b52ff2d287fcf6cfc456f3de3f28cae
 SHA512:
-  metadata.gz: affd8957e6074906a6471b0341d66e5f0df2e7b646994ed4940939270509a41cc1287faa0171d0c00b95aa0c3908c574ce9d28b27ab16c124458d3ff78c037e2
-  data.tar.gz: d3cfa506f11913c13bc71ca202f124821399ac2066993d69b06a052a176a8475ac708f968449e4b42dfe59a7679f5796f68c752f268a7d9b33d99dca28f3c700
+  metadata.gz: 287d1fd9d8468da07f37b2ba1c2af2292a88f0fc34bd581111c4dbd7d5e375d9f72260de1b10ec74ff690bf2913d73c2e4da829c047df05472e12aa2bc2cc858
+  data.tar.gz: 657f53bae563c8f50ae349e30e56411292f2e5be8a7bc910eb4506aa8eff8c6f3df6f8e46be085de9032869439ed68d3ff203180ae101addb4840a4800e2b6fe

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-faraday
 
+### v0.25.0 / 2025-01-07
+
+* ADDED: Faraday Minimum v1.0
+
 ### v0.24.8 / 2024-12-17
 
 * FIXED: Share Faraday Attrs with Adapter Spans

data/lib/opentelemetry/instrumentation/faraday/instrumentation.rb

@@ -10,12 +10,18 @@ module OpenTelemetry
       # The Instrumentation class contains logic to detect and install the Faraday
       # instrumentation
       class Instrumentation < OpenTelemetry::Instrumentation::Base
+        MINIMUM_VERSION = Gem::Version.new('1.0')
+
         install do |_config|
           require_dependencies
           register_tracer_middleware
           use_middleware_by_default
         end
 
+        compatible do
+          gem_version >= MINIMUM_VERSION
+        end
+
         present do
           defined?(::Faraday)
         end
@@ -25,10 +31,13 @@ module OpenTelemetry
 
         private
 
+        def gem_version
+          Gem::Version.new(::Faraday::VERSION)
+        end
+
         def require_dependencies
           require_relative 'middlewares/tracer_middleware'
           require_relative 'patches/connection'
-          require_relative 'patches/rack_builder'
         end
 
         def register_tracer_middleware
@@ -38,11 +47,7 @@ module OpenTelemetry
         end
 
         def use_middleware_by_default
-          if Gem::Version.new(::Faraday::VERSION) >= Gem::Version.new('1')
-            ::Faraday::Connection.prepend(Patches::Connection)
-          else
-            ::Faraday::RackBuilder.prepend(Patches::RackBuilder)
-          end
+          ::Faraday::Connection.prepend(Patches::Connection)
         end
       end
     end

data/lib/opentelemetry/instrumentation/faraday/patches/connection.rb

@@ -13,7 +13,7 @@ module OpenTelemetry
         module Connection
           # Wraps Faraday::Connection#initialize:
           # https://github.com/lostisland/faraday/blob/ff9dc1d1219a1bbdba95a9a4cf5d135b97247ee2/lib/faraday/connection.rb#L62-L92
-          def initialize(*args)
+          def initialize(...)
             super.tap do
               use(:open_telemetry) unless builder.handlers.any? do |handler|
                 handler.klass == Middlewares::TracerMiddleware

data/lib/opentelemetry/instrumentation/faraday/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Faraday
-      VERSION = '0.24.8'
+      VERSION = '0.25.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-faraday
 version: !ruby/object:Gem::Version
-  version: 0.24.8
+  version: 0.25.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2025-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -195,16 +195,15 @@ files:
 - lib/opentelemetry/instrumentation/faraday/instrumentation.rb
 - lib/opentelemetry/instrumentation/faraday/middlewares/tracer_middleware.rb
 - lib/opentelemetry/instrumentation/faraday/patches/connection.rb
-- lib/opentelemetry/instrumentation/faraday/patches/rack_builder.rb
 - lib/opentelemetry/instrumentation/faraday/version.rb
 homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-faraday/0.24.8/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-faraday/0.25.0/file/CHANGELOG.md
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/faraday
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-faraday/0.24.8
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-faraday/0.25.0
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/opentelemetry/instrumentation/faraday/patches/rack_builder.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright The OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-module OpenTelemetry
-  module Instrumentation
-    module Faraday
-      module Patches
-        # Module to be prepended to force Faraday to use the middleware by
-        # default so the user doesn't have to call `use` for every connection.
-        module RackBuilder
-          def adapter(*args)
-            use(:open_telemetry) unless @handlers.any? do |handler|
-              handler.klass == Faraday::Middlewares::TracerMiddleware
-            end
-
-            super
-          end
-        end
-      end
-    end
-  end
-end