refactoring

instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/handlers/default.rb

@@ -16,6 +16,7 @@ class Default
           def initialize(tracer, mapper)
             @tracer = tracer
             @mapper = mapper
+            @config = ActiveJob::Instrumentation.instance.config
           end
 
           # Invoked by ActiveSupport::Notifications at the start of the instrumentation block

instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/handlers/enqueue.rb

@@ -18,14 +18,17 @@ class Enqueue < Default
           # @param payload [Hash] containing job run information
           # @return [Hash] with the span and generated context tokens
           def start_span(name, _id, payload)
-            otel_config = ActiveJob::Instrumentation.instance.config
             job = payload.fetch(:job)
-            span_name = "#{otel_config[:span_naming] == :job_class ? job.class.name : job.queue_name} publish"
-            span = @tracer.start_span(span_name, kind: :producer, attributes: @mapper.call(payload))
+            span = @tracer.start_span(span_name_from(job), kind: :producer, attributes: @mapper.call(payload))
             tokens = [OpenTelemetry::Context.attach(OpenTelemetry::Trace.context_with_span(span))]
             OpenTelemetry.propagation.inject(job.__otel_headers) # This must be transmitted over the wire
             { span: span, ctx_tokens: tokens }
           end
+
+          # TODO: extract strategy
+          def span_name_from(job)
+            "#{@config[:span_naming] == :job_class ? job.class.name : job.queue_name} publish"
+          end
         end
       end
     end

instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/handlers/perform.rb

@@ -19,12 +19,13 @@ class Perform < Default
           # @return [Hash] with the span and generated context tokens
           def start_span(name, _id, payload)
             tokens = []
-            parent_context = OpenTelemetry.propagation.extract(payload.fetch(:job).__otel_headers)
+            job = payload.fetch(:job)
+            parent_context = OpenTelemetry.propagation.extract(job.__otel_headers)
 
-            span_name = span_name_from(payload)
+            span_name = span_name_from(job)
 
             # TODO: Refactor into a propagation strategy
-            propagation_style = otel_config[:propagation_style]
+            propagation_style = @config[:propagation_style]
             if propagation_style == :child
               tokens << OpenTelemetry::Context.attach(parent_context)
               span = @tracer.start_span(span_name, kind: :consumer, attributes: @mapper.call(payload))
@@ -53,13 +54,8 @@ def attach_consumer_context(span)
           end
 
           # TODO: refactor into a strategy
-          def span_name_from(payload)
-            "#{otel_config[:span_naming] == :job_class ? payload.fetch(:job).class.name : payload.fetch(:job).queue_name} process"
-          end
-
-          # TODO: use dependency injection
-          def otel_config
-            ActiveJob::Instrumentation.instance.config
+          def span_name_from(job)
+            "#{@config[:span_naming] == :job_class ? job.class.name : job.queue_name} process"
           end
         end
       end