perform.rb in opentelemetry-instrumentation-active_job-0.7.5

- old
+ new

@@ -8,23 +8,24 @@
   module Instrumentation
     module ActiveJob
       module Handlers
         # Handles perform.active_job to generate ingress spans
         class Perform < Default
+          EVENT_NAME = 'process'
+
           # Overrides the `Default#start_span` method to create an ingress span
           # and registers it with the current context
           #
           # @param name [String] of the Event
           # @param id [String] of the event
           # @param payload [Hash] containing job run information
           # @return [Hash] with the span and generated context tokens
           def start_span(name, _id, payload)
             job = payload.fetch(:job)
+            span_name = span_name(job, EVENT_NAME)
             parent_context = OpenTelemetry.propagation.extract(job.__otel_headers)
 
-            span_name = span_name(job)
-
             # TODO: Refactor into a propagation strategy
             propagation_style = @config[:propagation_style]
             if propagation_style == :child
               span = tracer.start_span(span_name, kind: :consumer, attributes: @mapper.call(payload))
             else
@@ -45,21 +46,9 @@
           def attach_consumer_context(span)
             consumer_context = OpenTelemetry::Trace.context_with_span(span)
             internal_context = OpenTelemetry::Instrumentation::ActiveJob.context_with_span(span, parent_context: consumer_context)
 
             OpenTelemetry::Context.attach(internal_context)
-          end
-
-          private
-
-          def span_name(job)
-            prefix = if @config[:span_naming] == :job_class
-                       job.class.name
-                     else
-                       job.queue_name
-                     end
-
-            "#{prefix} process"
           end
         end
       end
     end
   end