File tree Expand file tree Collapse file tree 4 files changed +13
-33
lines changed
lib/opentelemetry/instrumentation/faraday Expand file tree Collapse file tree 4 files changed +13
-33
lines changed Original file line number Diff line number Diff line change 4
4
#
5
5
# SPDX-License-Identifier: Apache-2.0
6
6
7
- %w[ 0.17.6 1.0 2.0 ] . each do |version |
7
+ %w[ 1.0 2.0 ] . each do |version |
8
8
appraise "faraday-#{ version } " do
9
9
gem 'faraday' , "~> #{ version } "
10
10
end
Original file line number Diff line number Diff line change @@ -10,12 +10,18 @@ module Faraday
10
10
# The Instrumentation class contains logic to detect and install the Faraday
11
11
# instrumentation
12
12
class Instrumentation < OpenTelemetry ::Instrumentation ::Base
13
+ MINIMUM_VERSION = Gem ::Version . new ( '1.0' )
14
+
13
15
install do |_config |
14
16
require_dependencies
15
17
register_tracer_middleware
16
18
use_middleware_by_default
17
19
end
18
20
21
+ compatible do
22
+ gem_version >= MINIMUM_VERSION
23
+ end
24
+
19
25
present do
20
26
defined? ( ::Faraday )
21
27
end
@@ -25,10 +31,13 @@ class Instrumentation < OpenTelemetry::Instrumentation::Base
25
31
26
32
private
27
33
34
+ def gem_version
35
+ Gem ::Version . new ( ::Faraday ::VERSION )
36
+ end
37
+
28
38
def require_dependencies
29
39
require_relative 'middlewares/tracer_middleware'
30
40
require_relative 'patches/connection'
31
- require_relative 'patches/rack_builder'
32
41
end
33
42
34
43
def register_tracer_middleware
@@ -38,11 +47,7 @@ def register_tracer_middleware
38
47
end
39
48
40
49
def use_middleware_by_default
41
- if Gem ::Version . new ( ::Faraday ::VERSION ) >= Gem ::Version . new ( '1' )
42
- ::Faraday ::Connection . prepend ( Patches ::Connection )
43
- else
44
- ::Faraday ::RackBuilder . prepend ( Patches ::RackBuilder )
45
- end
50
+ ::Faraday ::Connection . prepend ( Patches ::Connection )
46
51
end
47
52
end
48
53
end
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ module Patches
13
13
module Connection
14
14
# Wraps Faraday::Connection#initialize:
15
15
# https://github.com/lostisland/faraday/blob/ff9dc1d1219a1bbdba95a9a4cf5d135b97247ee2/lib/faraday/connection.rb#L62-L92
16
- def initialize ( * args )
16
+ def initialize ( ... )
17
17
super . tap do
18
18
use ( :open_telemetry ) unless builder . handlers . any? do |handler |
19
19
handler . klass == Middlewares ::TracerMiddleware
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments