deimos-ruby 2.0.14 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8597163d34a0b2afd7ef60bbc2eda8f08c4e441292181dc7d15215ad4b2ebd7
-  data.tar.gz: 364899fa4738dd1df44f98cecc67bdc503f1a679a26274f78b49bd8b29c1ee02
+  metadata.gz: fda90b7f018f9ef696c574248a0bbeabfff39b0d9d6b50fbb0f674e0a46adb83
+  data.tar.gz: ef3134f7e7e30d4caa44537089350a5ce85c9b8db13ed065f69a2723d7a2b943
 SHA512:
-  metadata.gz: 54eff5f5b0f375816b3a25516f602985b00440fe522d5495346fcb873d37fb1a822666ad04623c74002a15c15c3a70ba851099096d72eaba8ab9840a460ddbc2
-  data.tar.gz: 9901785951d244c09fc81ca6601c6700149b2f03f8246f167fe594fce778c035a1f81a1a468045930cf94e5787cecffcefdf069132cfe57686ec0172c8a28f5c
+  metadata.gz: 31622734e2657cdf5643594a97b5b56d04bd5bdbf9a56aea73c264f8300ecb9993d09491532f636dd71d208b1dd22af3e2cba0fd91c31d682b7b01efc980c9cc
+  data.tar.gz: a4b370d783983c5062a892c408981ebeb28472199be9700c43a5d5871b74f3f90885b9ee8bc8dd9307a7162d512ad69dca2f48311e98a278f28b5d703f07f5dc

data/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+## 2.0.16 - 2025-05-30
+
+- Fix: Send `publish` metric even if the producer was not a Deimos producer.
+
+## 2.0.15 - 2025-05-29
+
+- Fix: Do not force data to JSON when logging payloads. This allows log formatters to handle the payloads on their own (e.g. adding additional fields).
+- Fix: Add topic to "Publishing Messages" log message.
+
 ## 2.0.14 - 2025-05-26
 
 - Fix: Log actual payloads by default (was logging "null" for the payload).

data/lib/deimos/backends/base.rb

@@ -9,9 +9,10 @@ module Deimos
         # @param messages [Array<Hash>]
         # @return [void]
         def publish(producer_class:, messages:)
+          topic = producer_class.topic
           execute(producer_class: producer_class, messages: messages)
           message = ::Deimos::Logging.messages_log_text(producer_class.karafka_config.payload_log, messages)
-          Deimos::Logging.log_info({message: 'Publishing Messages:'}.merge(message))
+          Deimos::Logging.log_info({message: "Publishing Messages for #{topic}:" }.merge(message))
         end
 
         # @param producer_class [Class<Deimos::Producer>]

data/lib/deimos/backends/kafka.rb

@@ -7,11 +7,6 @@ module Deimos
       # :nodoc:
       def self.execute(producer_class:, messages:)
         Karafka.producer.produce_many_sync(messages)
-        Deimos.config.metrics&.increment(
-          'publish',
-          tags: %W(status:success topic:#{messages.first[:topic]}),
-          by: messages.size
-        )
       end
     end
   end

data/lib/deimos/backends/kafka_async.rb

@@ -7,11 +7,6 @@ module Deimos
       # :nodoc:
       def self.execute(producer_class:, messages:)
         Karafka.producer.produce_many_async(messages)
-        Deimos.config.metrics&.increment(
-          'publish',
-          tags: %W(status:success topic:#{messages.first[:topic]}),
-          by: messages.size
-        )
       end
     end
   end

data/lib/deimos/ext/producer_metrics_listener.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Deimos
+  class ProducerMetricsListener
+      %i[
+        produced_sync
+        produced_async
+      ].each do |event_scope|
+        define_method(:"on_message_#{event_scope}") do |event|
+          Deimos.config.metrics&.increment(
+            'publish',
+            tags: %W(status:success topic:#{event[:message][:topic]})
+          )
+        end
+
+        define_method(:"on_messages_#{event_scope}") do |event|
+          Deimos.config.metrics&.increment(
+            'publish',
+            tags: %W(status:success topic:#{event[:messages].first[:topic]}),
+            by: event[:messages].size
+          )
+        end
+      end
+  end
+end

data/lib/deimos/logging.rb

@@ -5,10 +5,10 @@ module Deimos
       def log_add(method, msg)
         if Karafka.logger.respond_to?(:tagged)
           Karafka.logger.tagged('Deimos') do |logger|
-            logger.send(method, msg.to_json)
+            logger.send(method, msg)
           end
         else
-          Karafka.logger.send(method, msg.to_json)
+          Karafka.logger.send(method, msg)
         end
       end
 

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '2.0.14'
+  VERSION = '2.0.16'
 end

data/lib/deimos.rb

@@ -25,6 +25,7 @@ require 'deimos/ext/schema_route'
 require 'deimos/ext/consumer_route'
 require 'deimos/ext/producer_route'
 require 'deimos/ext/producer_middleware'
+require 'deimos/ext/producer_metrics_listener'
 require 'deimos/ext/routing_defaults'
 
 require 'deimos/railtie' if defined?(Rails)
@@ -146,6 +147,8 @@ module Deimos
         Karafka::Setup::AttributesMap.producer(Karafka::Setup::Config.config.kafka.dup)
       EVENT_TYPES.each { |type| Karafka.monitor.notifications_bus.register_event(type) }
 
+      Karafka.producer.monitor.subscribe(ProducerMetricsListener.new)
+
       Karafka.producer.monitor.subscribe('error.occurred') do |event|
         if event.payload.key?(:messages)
           topic = event[:messages].first[:topic]

data/spec/producer_spec.rb

@@ -283,15 +283,15 @@ module ProducerTest
             ]
           )
           expect(Karafka.logger).to have_received(:info).with(match_message({
-            'message' => 'Publishing Messages:',
-            'payloads' => [
+            message: 'Publishing Messages for my-topic-with-id:',
+            payloads: [
               {
-                'payload' => { 'test_id' => 'foo', 'some_int' => 123 },
-                'key' => 'key'
+                payload: { 'test_id' => 'foo', 'some_int' => 123 },
+                key: 'key'
               },
               {
-                'payload' => { 'test_id' => 'foo2', 'some_int' => 123 },
-                'key' => 'key2'
+                payload: { 'test_id' => 'foo2', 'some_int' => 123 },
+                key: 'key2'
               }
             ]
           }))
@@ -309,8 +309,8 @@ module ProducerTest
             ]
           )
           expect(Karafka.logger).to have_received(:info).with(match_message({
-            'message' => 'Publishing Messages:',
-            'payloads_count' => 2
+            message: 'Publishing Messages for my-topic-with-id:',
+            payloads_count: 2
           }))
         end
       end

data/spec/spec_helper.rb

@@ -347,14 +347,13 @@ end
 RSpec::Matchers.define :match_message do |msg|
   match do |actual|
     begin
-      parsed = JSON.parse(actual)
-      parsed['payloads']&.each do |p|
-        p['payload'].delete('timestamp')
-        p['payload'].delete('message_id')
+      return false unless actual.is_a?(Hash)
+
+      actual[:payloads]&.each do |p|
+        p[:payload].delete('timestamp')
+        p[:payload].delete('message_id')
       end
-      expect(parsed).to match(a_hash_including(msg))
-    rescue JSON::ParserError
-      false
+      expect(actual).to match(a_hash_including(msg))
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.14
+  version: 2.0.16
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-26 00:00:00.000000000 Z
+date: 2025-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf
@@ -457,6 +457,7 @@ files:
 - lib/deimos/consumer.rb
 - lib/deimos/exceptions.rb
 - lib/deimos/ext/consumer_route.rb
+- lib/deimos/ext/producer_metrics_listener.rb
 - lib/deimos/ext/producer_middleware.rb
 - lib/deimos/ext/producer_route.rb
 - lib/deimos/ext/routing_defaults.rb