Merge branch 'feat/DEX-2307/fix-trace-id' into 'master'

[DEX-2307] fix: trace_id

Closes DEX-2307

See merge request nstmrt/rubygems/sbmt-kafka_consumer!59

CHANGELOG.md

@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+## [2.6.1] - 2024-07-05
+
+### Fixed
+
+- Use the current `trace_id` instead of creating a new one
+
 ## [2.6.0] - 2024-07-01
 
 ### Added

lib/sbmt/kafka_consumer/base_consumer.rb

@@ -3,8 +3,6 @@
 module Sbmt
   module KafkaConsumer
     class BaseConsumer < Karafka::BaseConsumer
-      attr_reader :trace_id
-
       def self.consumer_klass(skip_on_error: false, middlewares: [])
         Class.new(self) do
           const_set(:SKIP_ON_ERROR, skip_on_error)
@@ -41,8 +39,6 @@ def process_batch?
       private
 
       def with_instrumentation(message)
-        @trace_id = SecureRandom.base58
-
         logger.tagged(
           trace_id: trace_id,
           topic: message.metadata.topic, partition: message.metadata.partition,
@@ -69,8 +65,6 @@ def with_instrumentation(message)
       end
 
       def with_batch_instrumentation(messages)
-        @trace_id = SecureRandom.base58
-
         logger.tagged(
           trace_id: trace_id,
           first_offset: messages.first.metadata.offset,
@@ -88,8 +82,6 @@ def with_batch_instrumentation(messages)
       end
 
       def with_common_instrumentation(name, message)
-        @trace_id = SecureRandom.base58
-
         logger.tagged(
           trace_id: trace_id
         ) do
@@ -173,6 +165,10 @@ def call_middlewares(message, middlewares)
         end
         traverse_chain.call
       end
+
+      def trace_id
+        @trace_id ||= SecureRandom.base58
+      end
     end
   end
 end

lib/sbmt/kafka_consumer/version.rb

@@ -2,6 +2,6 @@
 
 module Sbmt
   module KafkaConsumer
-    VERSION = "2.6.0"
+    VERSION = "2.6.1"
   end
 end