feat: Use Default Span Name Format

It also allows users to rollback to legacy span name format. Follow up to open-telemetry#1014
arielvalentin · Jun 24, 2024 · 3f5a3ae · 3f5a3ae
1 parent e14d6b0
commit 3f5a3ae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/instrumentation/action_view/lib/opentelemetry/instrumentation/action_view/instrumentation.rb b/instrumentation/action_view/lib/opentelemetry/instrumentation/action_view/instrumentation.rb
@@ -24,6 +24,7 @@ class Instrumentation < OpenTelemetry::Instrumentation::Base
 
         option :disallowed_notification_payload_keys, default: [],  validate: :array
         option :notification_payload_transform,       default: nil, validate: :callable
+        option :legacy_span_names,                    default: false, validate: :boolean
 
         private
 

diff --git a/instrumentation/action_view/lib/opentelemetry/instrumentation/action_view/railtie.rb b/instrumentation/action_view/lib/opentelemetry/instrumentation/action_view/railtie.rb
@@ -19,13 +19,16 @@ class Railtie < ::Rails::Railtie
         config.after_initialize do
           ::OpenTelemetry::Instrumentation::ActiveSupport::Instrumentation.instance.install({})
 
+          span_name_formatter = config[:legacy_span_names] ? ::OpenTelemetry::Instrumentation::ActiveSupport::LEGACY_NAME_FORMATTER : nil
+
           SUBSCRIPTIONS.each do |subscription_name|
             config = ActionView::Instrumentation.instance.config
             ::OpenTelemetry::Instrumentation::ActiveSupport.subscribe(
               ActionView::Instrumentation.instance.tracer,
               subscription_name,
               config[:notification_payload_transform],
-              config[:disallowed_notification_payload_keys]
+              config[:disallowed_notification_payload_keys],
+              span_name_formatter: span_name_formatter
             )
           end
         end

diff --git a/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec b/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec
@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 3.0'
 
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
-  spec.add_dependency 'opentelemetry-instrumentation-active_support', '~> 0.1'
+  spec.add_dependency 'opentelemetry-instrumentation-active_support', '~> 0.6'
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.22.1'
 
   spec.add_development_dependency 'appraisal', '~> 2.5'
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ class Instrumentation < OpenTelemetry::Instrumentation::Base @@
             option :disallowed_notification_payload_keys, default: [],  validate: :array
             option :notification_payload_transform,       default: nil, validate: :callable
+            option :legacy_span_names,                    default: false, validate: :boolean
             private
@@ Expand Down @@