deimos-ruby 2.0.0.pre.beta5 → 2.0.0.pre.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec1175b32af9a438344b507df915824244ac3c2f0756465bf9c032795aad65a6
-  data.tar.gz: de5ded4703fd546c3257a8e5bdd52f502df9e755272588bd8636d5057e6f5279
+  metadata.gz: 6c6c076148afa37dbbabda28cab52fd660a17913d303242559b2e6b9111b6b64
+  data.tar.gz: a2e21a56c1bf8ac9c46741e2a62fae7110dad6733f38ef958d81c9ef679b1fef
 SHA512:
-  metadata.gz: 7e9db7f92753f6b3d4433ab8545f91f43e7179c9438849766567b88247216f159413c7ec6048ea58681bad5478d9a569da5ce1ab58cc72147ccecdd800130ce0
-  data.tar.gz: a12e93d3db8bc7f9fb9f35afe43c9ec23ed3203a6fc4e80a1d1832403b1b77b664d6abdfa95da4d220bb1b4e348c215fa9e35c247de0e4a2d933b680e3cea544
+  metadata.gz: 1dcb4979f69587dcd428b71cb4617fcac7692a4c5b9ca5f8097481c648c1c6b9ec4cd350727a6d3f7f6b4cd5c30fe4f422a67c1b0461b5c606b3112ec22a4ded
+  data.tar.gz: b00fd19e08d89044bb069f8a70ba082fe7eafa9a23c08181fca2e297f21fa2856bb25e89f04b9084650a4b6f853d3c471ce2fb5aa6767db286b6ae663ae0092a

data/Gemfile

@@ -4,4 +4,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in boilerplate.gemspec
 gemspec
-gem 'karafka', git: 'https://github.com/dorner/karafka', branch: 'redraw'

data/lib/deimos/ext/producer_middleware.rb

@@ -18,6 +18,10 @@ module Deimos
                                   partition_key: message[:partition_key])
           _process_message(m, message, config)
           message[:payload] = m.encoded_payload
+          message[:label] = {
+            original_payload: m.payload,
+            original_key: m.key
+          }
           message[:key] = m.encoded_key
           message[:partition_key] = if m.partition_key
                                       m.partition_key.to_s

data/lib/deimos/logging.rb

@@ -36,22 +36,42 @@ module Deimos
 
       end
 
+      def payload(m)
+        return nil if m.nil?
+
+        if m.respond_to?(:payload)
+          m.payload
+        elsif m[:label]
+          m.dig(:label, :raw_payload)
+        else
+          m[:payload]
+        end
+      end
+
+      def key(m)
+        return nil if m.nil?
+
+        if m.respond_to?(:payload) && m.payload
+          m.key || m.payload['message_id']
+        elsif m.respond_to?(:[])
+          if m[:label]
+            m.dig(:label, :original_key)
+          elsif m[:payload].is_a?(String)
+            m[:key] || m[:payload_key]
+          else
+            payload = m[:payload]&.with_indifferent_access
+            m[:key] || m[:payload_key] || payload[:payload_key] || payload[:message_id]
+          end
+        end
+      end
+
       def messages_log_text(payload_log, messages)
         log_message = {}
 
         case payload_log
         when :keys
           keys = messages.map do |m|
-            if m.respond_to?(:payload)
-              m.key || m.payload['message_id']
-            elsif m
-              if m[:payload].is_a?(String)
-                m[:key] || m[:payload_key]
-              else
-                payload = m[:payload]&.with_indifferent_access
-                m[:key] || m[:payload_key] || payload[:payload_key] || payload[:message_id]
-              end
-            end
+            key(m)
           end
           log_message.merge!(
             payload_keys: keys
@@ -68,8 +88,8 @@ module Deimos
           log_message.merge!(
             payloads: messages.map do |m|
               {
-                payload: m.respond_to?(:payload) ? m.payload : m[:payload],
-                key: m.respond_to?(:payload) ? m.key : m[:key]
+                payload: payload(m),
+                key: key(m)
               }
             end
           )

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '2.0.0-beta5'
+  VERSION = '2.0.0-beta6'
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 $LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
+require 'logger' # https://stackoverflow.com/questions/79360526/uninitialized-constant-activesupportloggerthreadsafelevellogger-nameerror
 require 'active_record'
 require 'action_controller/railtie'
 require 'database_cleaner'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta5
+  version: 2.0.0.pre.beta6
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-19 00:00:00.000000000 Z
+date: 2025-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf