CCOL-2039: Update datadog span tagging

flipp-oss · Dec 6, 2023 · 74364f6 · 74364f6
1 parent 1e5d3a5
commit 74364f6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/deimos/active_record_consume/batch_consumption.rb b/lib/deimos/active_record_consume/batch_consumption.rb
@@ -28,16 +28,16 @@ def consume_batch(payloads, metadata)
           zip(metadata[:keys]).
           map { |p, k| Deimos::Message.new(p, nil, key: k) }
 
-        Deimos.config.tracer.active_span.set_tag('topic', metadata[:topic])
+        tag = metadata[:topic]
+        Deimos.config.tracer.active_span.set_tag('topic', tag)
 
-        Deimos.instrument('ar_consumer.consume_batch',
-                          Deimos.config.tracer.active_span.get_tag('topic')) do
+        Deimos.instrument('ar_consumer.consume_batch', tag) do
           if @compacted || self.class.config[:no_keys]
             update_database(compact_messages(messages))
           else
             uncompacted_update(messages)
           end
-                          end
+        end
       end
 
     protected

diff --git a/lib/deimos/tracing/datadog.rb b/lib/deimos/tracing/datadog.rb
@@ -45,6 +45,11 @@ def set_tag(tag, value, span=nil)
         (span || active_span).set_tag(tag, value)
       end
 
+      # :nodoc:
+      def get_tag(tag)
+        active_span.get_tag(tag)
+      end
+
     end
   end
 end