opentelemetry-instrumentation-faraday 0.24.4 → 0.24.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4369491afcc96f449fbca35fc61a24f2e154d9b9296fe42888358d3e06f75897
-  data.tar.gz: 3a90c89f16794e94ec26f5464d3c0da5acf56e8ff160d72627fc0b567a3ce39c
+  metadata.gz: 39ec6be55b4bf318fc30fddbe67a94928548fcf913bc089d556ed45c54a0a3c6
+  data.tar.gz: 119610d0f96a58afcb5d4a3611a23eac4754174816773199cc63084fc219d891
 SHA512:
-  metadata.gz: 88c5ea7f771a0e8242afc91a8d1bb98fc5d3efa812282499240d369d00ff1e41dc5a02c54afa41d9ea2e84be85e879dbafa8ebfde5ab45d0e7add756cb619018
-  data.tar.gz: aaeefe00ccffda2d09eb5b62757029be014ec9db26e0bfe8e8907170b08743f71d6e8567cbe30efc5e2ccb4735f879df11d8c1f822d0bcb4fed4ba64d4b9d923
+  metadata.gz: 831e19d7d378bb5444764ccb32ad14ad23f0e0d201cb90a64155dc9feffa78a459abe89037c1285c218101c1e70c08f574e2f9b3d7966032b07a2c11691dd819
+  data.tar.gz: 36f868a9c5d23ee86bb300413208d1808c48fd7984a68b09ddced3200d0daf353405b4572ffa7772bf065240455bcf5e60a55e3b203b3a3d56cb102acb89687b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-faraday
 
+### v0.24.5 / 2024-06-20
+
+* FIXED: Compatibility with Faraday v1
+
 ### v0.24.4 / 2024-06-18
 
 * FIXED: Relax otel common gem constraints

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

@@ -27,6 +27,7 @@ module OpenTelemetry
 
         def require_dependencies
           require_relative 'middlewares/tracer_middleware'
+          require_relative 'patches/connection'
           require_relative 'patches/rack_builder'
         end
 
@@ -37,7 +38,11 @@ module OpenTelemetry
         end
 
         def use_middleware_by_default
-          ::Faraday::RackBuilder.prepend(Patches::RackBuilder)
+          if Gem::Version.new(::Faraday::VERSION) >= Gem::Version.new('1')
+            ::Faraday::Connection.prepend(Patches::Connection)
+          else
+            ::Faraday::RackBuilder.prepend(Patches::RackBuilder)
+          end
         end
       end
     end

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

@@ -0,0 +1,27 @@
+# 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 Connection
+          # Wraps Faraday::Connection#initialize:
+          # https://github.com/lostisland/faraday/blob/ff9dc1d1219a1bbdba95a9a4cf5d135b97247ee2/lib/faraday/connection.rb#L62-L92
+          def initialize(*args)
+            super.tap do
+              use(:open_telemetry) unless builder.handlers.any? do |handler|
+                handler.klass == Middlewares::TracerMiddleware
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Faraday
-      VERSION = '0.24.4'
+      VERSION = '0.24.5'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-faraday
 version: !ruby/object:Gem::Version
-  version: 0.24.4
+  version: 0.24.5
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-18 00:00:00.000000000 Z
+date: 2024-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -194,16 +194,17 @@ files:
 - lib/opentelemetry/instrumentation/faraday.rb
 - 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.4/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-faraday/0.24.5/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.4
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-faraday/0.24.5
 post_install_message: 
 rdoc_options: []
 require_paths: