opentelemetry-instrumentation-rack 0.24.2 → 0.24.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16d2ecb73620544cae656f0eb4915e8dc74292a5bd76a9be27e1a125e9c1966e
-  data.tar.gz: 97af5d4b06a3fee698709bc64b06455147d31327673f59e1733d79980d85a256
+  metadata.gz: 9e0a7aa95948770110e53fd9820a83803bce9d8676651749eae3444ee52e6dec
+  data.tar.gz: 79a47cec9234b839e5bb0443ae21ed20089b9b1cf118134c49765e91c6d58a53
 SHA512:
-  metadata.gz: 237bae7518c29ca6f0b7db4f8814b1f2a49215a029915475d161e991acdba6253888eb934326a443c3e35d6a0557360a667edefd51e06d9748a35340fe61f042
-  data.tar.gz: c08d5155f0ea009fc43717b77ae5fef6a5ef7e9d133a87edc2fa65b1c84ce0701785a7638d40c082ccda3f12b288b30fcacd786b8a6668a3962f8802f5c44c2a
+  metadata.gz: e419cc2c5588be14db50dec6bfd27713b869e5bfbb14d9c1650415e621474f5935f7176c92a90db77940111b3bc8ca4a992a77abb4b508e03f94dd2a9e9dbe9d
+  data.tar.gz: 2f633ddbb221b71857db4925b425c9cc9202431f3ba61e1d32f2cb9438274ceea778a7ce7be6f010d6cb3233ace9f752ad55bdbbf2c720e33fe155301165853f

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-rack
 
+### v0.24.3 / 2024-05-08
+
+* FIXED: Rack event baggage handling
+
 ### v0.24.2 / 2024-04-30
 
 * FIXED: Bundler conflict warnings

data/lib/opentelemetry/instrumentation/rack/middlewares/event_handler.rb

@@ -42,7 +42,7 @@ module OpenTelemetry
         class EventHandler
           include ::Rack::Events::Abstract
 
-          TOKENS_KEY = 'otel.context.tokens'
+          OTEL_TOKEN_AND_SPAN = 'otel.rack.token_and_span'
           GOOD_HTTP_STATUSES = (100..499)
 
           # Creates a server span for this current request using the incoming parent context
@@ -56,7 +56,9 @@ module OpenTelemetry
 
             parent_context = extract_remote_context(request)
             span = create_span(parent_context, request)
-            request.env[TOKENS_KEY] = register_current_span(span)
+            span_ctx = OpenTelemetry::Trace.context_with_span(span, parent_context: parent_context)
+            rack_ctx = OpenTelemetry::Instrumentation::Rack.context_with_span(span, parent_context: span_ctx)
+            request.env[OTEL_TOKEN_AND_SPAN] = [OpenTelemetry::Context.attach(rack_ctx), span]
           rescue StandardError => e
             OpenTelemetry.handle_error(exception: e)
           end
@@ -108,7 +110,7 @@ module OpenTelemetry
           rescue StandardError => e
             OpenTelemetry.handle_error(exception: e)
           ensure
-            detach_contexts(request)
+            detach_context(request)
           end
 
           private
@@ -191,11 +193,12 @@ module OpenTelemetry
             attributes
           end
 
-          def detach_contexts(request)
-            request.env[TOKENS_KEY]&.reverse_each do |token|
-              OpenTelemetry::Context.detach(token)
-              OpenTelemetry::Trace.current_span.finish
-            end
+          def detach_context(request)
+            return nil unless request.env[OTEL_TOKEN_AND_SPAN]
+
+            token, span = request.env[OTEL_TOKEN_AND_SPAN]
+            span.finish
+            OpenTelemetry::Context.detach(token)
           rescue StandardError => e
             OpenTelemetry.handle_error(exception: e)
           end
@@ -244,15 +247,6 @@ module OpenTelemetry
             OpenTelemetry::Instrumentation::Rack::Instrumentation.instance.config
           end
 
-          def register_current_span(span)
-            ctx = OpenTelemetry::Trace.context_with_span(span)
-            rack_ctx = OpenTelemetry::Instrumentation::Rack.context_with_span(span, parent_context: ctx)
-
-            contexts = [ctx, rack_ctx]
-            contexts.compact!
-            contexts.map { |context| OpenTelemetry::Context.attach(context) }
-          end
-
           def create_span(parent_context, request)
             span = tracer.start_span(
               create_request_span_name(request),

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Rack
-      VERSION = '0.24.2'
+      VERSION = '0.24.3'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-rack
 version: !ruby/object:Gem::Version
-  version: 0.24.2
+  version: 0.24.3
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2024-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -258,10 +258,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-rack/0.24.2/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-rack/0.24.3/file/CHANGELOG.md
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/rack
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-rack/0.24.2
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-rack/0.24.3
 post_install_message: 
 rdoc_options: []
 require_paths: