deimos-ruby 1.24.3 → 2.0.0.pre.alpha1

data/lib/deimos/backends/kafka.rb

@@ -4,30 +4,14 @@ module Deimos
   module Backends
     # Default backend to produce to Kafka.
     class Kafka < Base
-      include Phobos::Producer
-
-      # Shut down the producer if necessary.
-      # @return [void]
-      def self.shutdown_producer
-        producer.sync_producer_shutdown if producer.respond_to?(:sync_producer_shutdown)
-        producer.kafka_client&.close
-      end
-
       # :nodoc:
       def self.execute(producer_class:, messages:)
-        Deimos.instrument(
-          'produce',
-          producer: producer_class,
-          topic: producer_class.topic,
-          payloads: messages.map(&:payload)
-        ) do
-          producer.publish_list(messages.map(&:encoded_hash))
-          Deimos.config.metrics&.increment(
-            'publish',
-            tags: %W(status:success topic:#{producer_class.topic}),
-            by: messages.size
-          )
-        end
+        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

@@ -4,30 +4,14 @@ module Deimos
   module Backends
     # Backend which produces to Kafka via an async producer.
     class KafkaAsync < Base
-      include Phobos::Producer
-
-      # Shut down the producer cleanly.
-      # @return [void]
-      def self.shutdown_producer
-        producer.async_producer_shutdown
-        producer.kafka_client&.close
-      end
-
       # :nodoc:
       def self.execute(producer_class:, messages:)
-        Deimos.instrument(
-          'produce',
-          producer: producer_class,
-          topic: producer_class.topic,
-          payloads: messages.map(&:payload)
-        ) do
-          producer.async_publish_list(messages.map(&:encoded_hash))
-          Deimos.config.metrics&.increment(
-            'publish',
-            tags: %W(status:success topic:#{producer_class.topic}),
-            by: messages.size
-          )
-        end
+        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/backends/{db.rb → outbox.rb}

@@ -6,22 +6,23 @@ module Deimos
   module Backends
     # Backend which saves messages to the database instead of immediately
     # sending them.
-    class Db < Base
+    class Outbox < Base
       class << self
         # :nodoc:
         def execute(producer_class:, messages:)
           records = messages.map do |m|
+            Deimos::ProducerMiddleware.call(m)
             message = Deimos::KafkaMessage.new(
-              message: m.encoded_payload ? m.encoded_payload.to_s.b : nil,
-              topic: m.topic,
+              message: m[:payload] ? m[:payload].to_s.b : nil,
+              topic: m[:topic],
               partition_key: partition_key_for(m)
             )
-            message.key = m.encoded_key.to_s.b unless producer_class.config[:no_keys]
+            message.key = m[:key].to_s.b if m[:key]
             message
           end
           Deimos::KafkaMessage.import(records)
           Deimos.config.metrics&.increment(
-            'db_producer.insert',
+            'outbox.insert',
             tags: %W(topic:#{producer_class.topic}),
             by: records.size
           )
@@ -30,10 +31,13 @@ module Deimos
         # @param message [Deimos::Message]
         # @return [String] the partition key to use for this message
         def partition_key_for(message)
-          return message.partition_key if message.partition_key.present?
-          return message.key unless message.key.is_a?(Hash)
-
-          message.key.to_yaml
+          if message[:partition_key].present?
+            message[:partition_key]
+          elsif message[:key].present?
+            message[:key].to_s.b
+          else
+            nil
+          end
         end
       end
     end