sbmt-outbox 6.9.0 → 6.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d1f4fc3cdedb0f5965cd7f6300aa6ac3535053d94b62dd0b6fb440d542edc4c
-  data.tar.gz: 0bc0039248269d121d003a8175469a316bf87c55b9331765c21b3a2fb7f954b9
+  metadata.gz: 563533826523f381bff35759aecedd3f1b5ed4e20067725e7f28d0a94808ab89
+  data.tar.gz: 3a974ff0df4cf3a771888b521d33e9d5b5df367973b9a43fc6dfd4f6418caed0
 SHA512:
-  metadata.gz: 18d8a5e96cb13869f08fd91ee1f2581cc738d1fe5df7b4532503537d246fa37a15c074db87b7f9e8fe6895c0fc495467eabe9563c5923e0c2220459bde744566
-  data.tar.gz: e15f6f2c0d1bc1b6c6b54e6702dc35a928e124d826d74f1f5fee274d43336db5866a9db6bab3c107354fff8dbdf26a8e89626dfeb66c3e9407de48b456350525
+  metadata.gz: 4af541b2e8db7fa1fec41071caf150a1df4e973a1f93bfc2491288d0d4fe69a49d20cc9ebd96dcb378d0b6cc381baef68b8dbd5cfde8fdb062730125fdcac120
+  data.tar.gz: 8274526f2a1c4fa433a20787ef14b07b83de4d11fa5d87f9ba30c7639bbb1396d4ae0fcec6d07493336d050ff757324e9bf88d14495e1ac803c1bf074a71734b

data/app/interactors/sbmt/outbox/process_item.rb

@@ -11,7 +11,7 @@ module Sbmt
 
       METRICS_COUNTERS = %i[error_counter retry_counter sent_counter fetch_error_counter discarded_counter].freeze
 
-      delegate :log_success, :log_failure, to: "Sbmt::Outbox.logger"
+      delegate :log_success, :log_info, :log_failure, to: "Sbmt::Outbox.logger"
       delegate :item_process_middlewares, to: "Sbmt::Outbox"
       delegate :box_type, :box_name, :owner, to: :item_class
 
@@ -73,7 +73,7 @@ module Sbmt
         end
 
         unless item.for_processing?
-          log_error("already processed")
+          log_info("already processed")
           counters[:fetch_error_counter] += 1
           return Failure(:already_processed)
         end
@@ -154,7 +154,7 @@ module Sbmt
       # rubocop:enable Metrics/MethodLength
 
       def track_failed(ex_or_msg, item = nil)
-        log_error(ex_or_msg, item)
+        log_processing_error(ex_or_msg, item)
 
         item&.touch_processed_at
         item&.add_error(ex_or_msg)
@@ -170,6 +170,8 @@ module Sbmt
           counters[:retry_counter] += 1
           item.pending!
         end
+      rescue => e
+        log_error_handling_error(e, item)
       end
 
       def track_successed(item)
@@ -196,18 +198,28 @@ module Sbmt
         counters[:discarded_counter] += 1
       end
 
-      def log_error(ex_or_msg, item = nil)
+      def log_processing_error(ex_or_msg, item = nil)
         text = format_exception_error(ex_or_msg)
 
         msg = "Failed processing #{box_type} item with error: #{text}.\n" \
               "Record: #{item_class.name}##{item_id}.\n" \
               "#{item&.log_details&.to_json}"
 
-        log_failure(msg, backtrace: format_backtrace(ex_or_msg))
+        log_failure(msg, stacktrace: format_backtrace(ex_or_msg))
       end
 
-      def format_exception_error(e)
-        text = if e.respond_to?(:cause) && !e.cause.nil?
+      def log_error_handling_error(handling_error, item = nil)
+        text = format_exception_error(handling_error, extract_cause: false)
+
+        msg = "Could not persist status of failed #{box_type} item due to error: #{text}.\n" \
+          "Record: #{item_class.name}##{item_id}.\n" \
+          "#{item&.log_details&.to_json}"
+
+        log_failure(msg, stacktrace: format_backtrace(handling_error))
+      end
+
+      def format_exception_error(e, extract_cause: true)
+        text = if extract_cause && e.respond_to?(:cause) && !e.cause.nil?
           "#{format_exception_error(e.cause)}. "
         else
           ""

data/lib/sbmt/outbox/middleware/open_telemetry/tracing_item_process_middleware.rb

@@ -28,7 +28,9 @@ module Sbmt
             extracted_context = ::OpenTelemetry.propagation.extract(item_options_headers)
             ::OpenTelemetry::Context.with_current(extracted_context) do
               tracer.in_span(span_name(item_class), attributes: span_attributes.compact, kind: :consumer) do
-                yield
+                Sbmt::Outbox.logger.with_tags(trace_id: trace_id) do
+                  yield
+                end
               end
             end
           end
@@ -42,6 +44,12 @@ module Sbmt
           def span_name(item_class)
             "#{item_class.box_type}/#{item_class.box_name} process item"
           end
+
+          def trace_id
+            context = ::OpenTelemetry::Trace.current_span.context
+
+            context.valid? ? context.hex_trace_id : nil
+          end
         end
       end
     end

data/lib/sbmt/outbox/middleware/sentry/tracing_batch_process_middleware.rb

@@ -16,7 +16,6 @@ module Sbmt
 
             # transaction will be nil if sentry tracing is not enabled
             transaction = start_transaction(scope, job)
-            job.log_tags[:trace_id] = scope&.tags&.[](:trace_id)
 
             begin
               yield

data/lib/sbmt/outbox/v1/worker.rb

@@ -218,7 +218,7 @@ module Sbmt
 
           logger.log_error(
             "Failed processing #{job.resource_key} with error: #{e.class} #{e.message}",
-            backtrace: backtrace
+            stacktrace: backtrace
           )
         end
 

data/lib/sbmt/outbox/v2/box_processor.rb

@@ -134,7 +134,7 @@ module Sbmt
 
           logger.log_error(
             "Failed processing #{task} with error: #{e.class} #{e.message}",
-            backtrace: backtrace
+            stacktrace: backtrace
           )
         end
 

data/lib/sbmt/outbox/version.rb

@@ -2,6 +2,6 @@
 
 module Sbmt
   module Outbox
-    VERSION = "6.9.0"
+    VERSION = "6.10.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbmt-outbox
 version: !ruby/object:Gem::Version
-  version: 6.9.0
+  version: 6.10.1
 platform: ruby
 authors:
 - Sbermarket Ruby-Platform Team
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-13 00:00:00.000000000 Z
+date: 2024-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool