opentelemetry-instrumentation-action_pack 0.12.2 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d469bead142d9682483795b636de7c9d46fc8d410651f3409ab8e106a9d28f48
-  data.tar.gz: 3e5fbfaa2a26ea52fa01f58077f8420e92b4a7a3561a4b6547ecbeecfcea07c7
+  metadata.gz: 4262115e2b8bb06f5aa8dee186cc073fa3998796d2ee0a5107493c752d575eb9
+  data.tar.gz: 40c809efb6f9a26ce5f2e5c35e9fbca63a0b8ab24ccb9b84217d138f46a42df7
 SHA512:
-  metadata.gz: 98b81892126505b05311b3ca67feb6e530e7543742fa36895e301312e737ed8e5804f8c840aaf8e743ac29e00cec79d81be9908313888311f958225ba7a38d65
-  data.tar.gz: 1207dcac466eb75ba81f1b2ce75e8be3136f26d22e997fdb4acace9b84fbadba18aac959f181f29c8a2a0b091a9e9c7b5a3c2e37d86ec108080391c888bd8266
+  metadata.gz: '019f275b7a386e8c963a74bba5a97f7eb3ef40fe59986a89c82d2b8564548f886a5cce2ddc9e92870e1081a8835c06a8bdcc1af2de6b0be917a31742e9333c72'
+  data.tar.gz: 61cdabe47d151ae6ef41d64aa3cb34efd5d9ac8b93a8fa4aed59f41497ca94319f86ddd60a15e6d616476185d686f93da2ba1d181517992fec4f809ddb27c995

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-action_pack
 
+### v0.12.3 / 2025-06-16
+
+* FIXED: Action_pack always assuming sdk spans
+
 ### v0.12.2 / 2025-06-04
 
 * FIXED: Rack span class naming

data/lib/opentelemetry/instrumentation/action_pack/handlers/action_controller.rb

@@ -23,6 +23,9 @@ module OpenTelemetry
           # @param payload [Hash] the payload passed as a method argument
           # @return [Hash] the payload passed as a method argument
           def start(_name, _id, payload)
+            span = OpenTelemetry::Instrumentation::Rack.current_span
+            return unless span.recording?
+
             request = payload[:request]
             # It seems that there are cases in Rails functional tests where it bypasses the routing system and the `action_dispatch.route_uri_pattern` header not being set.
             # Our Test suite executes the routing system so we are unable to recreate this error case.
@@ -36,22 +39,18 @@ module OpenTelemetry
             attributes[OpenTelemetry::SemanticConventions::Trace::HTTP_ROUTE] = http_route if http_route
             attributes[OpenTelemetry::SemanticConventions::Trace::HTTP_TARGET] = request.filtered_path if request.filtered_path != request.fullpath
 
-            span = OpenTelemetry::Instrumentation::Rack.current_span
-            span_name = if @span_naming == :semconv
-                          if http_route
+            if @span_naming == :semconv
+              span.name = if http_route
                             "#{request.method} #{http_route}"
                           else
                             "#{request.method} /#{payload.dig(:params, :controller)}/#{payload.dig(:params, :action)}"
                           end
-                        # If there is an exception we want to keep the original span name
-                        # so it is easier to see where the request was routed to.
-                        elsif request.env['action_dispatch.exception']
-                          span.name
-                        else
-                          "#{payload[:controller]}##{payload[:action]}"
-                        end
+            # If there is an exception we want to keep the original span name
+            # so it is easier to see where the request was routed to.
+            elsif !request.env['action_dispatch.exception']
+              span.name = "#{payload[:controller]}##{payload[:action]}"
+            end
 
-            span.name = span_name
             span.add_attributes(attributes)
           rescue StandardError => e
             OpenTelemetry.handle_error(exception: e)

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActionPack
-      VERSION = '0.12.2'
+      VERSION = '0.12.3'
     end
   end
 end

metadata

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