fix: sinatra to stop using api env getter (#1038)

robertlaurin · web-flow · commit 2ac008e02975 · 2021-11-29T15:31:54.000-06:00
diff --git a/instrumentation/sinatra/lib/opentelemetry/instrumentation/sinatra/middlewares/tracer_middleware.rb b/instrumentation/sinatra/lib/opentelemetry/instrumentation/sinatra/middlewares/tracer_middleware.rb
@@ -17,7 +17,7 @@ def initialize(app)
           def call(env)
             extracted_context = OpenTelemetry.propagation.extract(
               env,
-              getter: OpenTelemetry::Context::Propagation.rack_env_getter
+              getter: OpenTelemetry::Common::Propagation.rack_env_getter
             )
             OpenTelemetry::Context.with_current(extracted_context) do
               tracer.in_span(
diff --git a/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec b/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec
@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.5.0'
 
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
+  spec.add_dependency 'opentelemetry-common', '~> 0.19.2'
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.18.3'
 
   spec.add_development_dependency 'appraisal', '~> 2.2.0'

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ def initialize(app)`
`17`	`17`	`def call(env)`
`18`	`18`	`extracted_context = OpenTelemetry.propagation.extract(`
`19`	`19`	`env,`
`20`		`- getter: OpenTelemetry::Context::Propagation.rack_env_getter`
	`20`	`+ getter: OpenTelemetry::Common::Propagation.rack_env_getter`
`21`	`21`	`)`
`22`	`22`	`OpenTelemetry::Context.with_current(extracted_context) do`
`23`	`23`	`tracer.in_span(`