squash: use proxy tracer to upgrade later

open-telemetry · Oct 10, 2023 · f996004 · f996004
1 parent ddb8906
commit f996004
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/instrumentation/active_job/example/active_job.rb b/instrumentation/active_job/example/active_job.rb
@@ -84,7 +84,7 @@ def perform
 
 class DoItNowJob < ::ActiveJob::Base
   def perform
-    puts <<~EOS
+    $stderr.puts <<~EOS
 
     --------------------------------------------------
      Called with perform_now!

diff --git a/instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/handlers.rb b/instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/handlers.rb
@@ -38,7 +38,7 @@ module Handlers
         def subscribe
           return unless Array(@subscriptions).empty?
 
-          tracer = Instrumentation.instance.tracer
+          tracer = OpenTelemetry.tracer_provider.tracer(ActiveJob.name, ActiveJob::VERSION)
           mapper = Mappers::Attribute.new
           config = ActiveJob::Instrumentation.instance.config
           parent_span_provider = OpenTelemetry::Instrumentation::ActiveJob

diff --git a/instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/handlers/default.rb b/instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/handlers/default.rb
@@ -74,8 +74,10 @@ def finish(_name, _id, payload)
           def finish_span(span, tokens)
             # closes the span after all attributes have been finalized
             begin
-              span&.status = OpenTelemetry::Trace::Status.ok if span&.status&.code == OpenTelemetry::Trace::Status::UNSET
-              span&.finish
+              if span&.recording?
+                span&.status = OpenTelemetry::Trace::Status.ok if span&.status&.code == OpenTelemetry::Trace::Status::UNSET
+                span&.finish
+              end
             rescue StandardError => e
               OpenTelemetry.handle_error(exception: e)
             end