deimos-ruby 2.0.0.pre.alpha7 → 2.0.0.pre.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0940b779309de8eadfc2fe3b5a495690a83f90598045ce790d9bb50d82954909'
-  data.tar.gz: ae6d40e15e06cb17070ce92421d1546f9d97bd4c4cddb909925d282db49be32c
+  metadata.gz: 42ac705b5012248d24a0355f4fbb8ad3e66ed57b3ee08329aea148b57fe65a27
+  data.tar.gz: d5e22a7400ed5471815ea8b14a86fe3253ea870c024c4c7ecfcacc5f80042085
 SHA512:
-  metadata.gz: 60a19bd65c424f05e8061f8a0fb2e7a1648f6d7f8202cbbd4e40397e5d75cae5d4935d313133ebee6b0641f3505d4161681d7f4534bb0f665e06eca9f28f6d34
-  data.tar.gz: 13974c3ee935306e72220149a943a5fef0554b332c5c7b81f348df584b7cba0756f9c9d4569856edc72e054981eebdb95789e605fbeddcca72a0b79b207bcae1
+  metadata.gz: 0c6f493835cff025892932d7b8d6f0f2ad61f2d26eda7523fe2df217916187512cec3c3e5e21c08eaeaedfc2ede260acee03e0341ee844e13f28974a79de9913
+  data.tar.gz: d74bad2d818f09bc81577c06eef13071bbe52d0f3bddec7b8067fa5e360200db96af50d4d1e7f477390d2dca4ba66ae9101ce281f312d6c6acdfedbd5b8efa0d

data/lib/deimos/active_record_consume/batch_consumption.rb

@@ -66,7 +66,7 @@ module Deimos
       def record_key(key)
         if key.nil?
           {}
-        elsif key.is_a?(Hash)
+        elsif key.is_a?(Hash) || key.is_a?(SchemaClass::Record)
           self.key_converter.convert(key)
         elsif self.topic.key_config[:field].nil?
           { @klass.primary_key => key }

data/lib/deimos/config/configuration.rb

@@ -63,7 +63,7 @@ module Deimos # rubocop:disable Metrics/ModuleLength
     setting :phobos_logger, removed: 'Separate logger for Phobos is no longer supported'
 
     setting :kafka do
-      setting :logger, removed: "Karafka uses Rails logger by default"
+      setting :logger, Logger.new(STDOUT), removed: "Karafka uses Rails logger by default"
       setting :seed_brokers, ['localhost:9092'], removed: 'Use kafka(bootstrap.servers) in Karafka settings'
       setting :client_id, 'phobos', removed: 'Use client_id in Karafka setup block.'
       setting :connect_timeout, 15, removed: 'Use kafka(socket.connection.setup.timeout.ms) in Karafka settings'

data/lib/deimos/ext/producer_middleware.rb

@@ -10,7 +10,7 @@ module Deimos
           message: message
         ) do
           config = Deimos.karafka_config_for(topic: message[:topic])
-          return message if config.nil?
+          return message if config.nil? || config.schema.nil?
           return if message[:payload] && !message[:payload].is_a?(Hash) && !message[:payload].is_a?(SchemaClass::Record)
 
           m = Deimos::Message.new(message[:payload].to_h,

data/lib/deimos/ext/routing_defaults.rb

@@ -14,7 +14,7 @@ class Matcher
   def replay_on(topic_node)
     @applications.each do |method, kwargs|
       if method == :kafka
-        topic_node.kafka = kwargs
+        topic_node.kafka = kwargs.is_a?(Array) ? kwargs[0] : kwargs
         next
       end
       if kwargs.is_a?(Hash)

data/lib/deimos/logging.rb

@@ -42,7 +42,12 @@ module Deimos
         case payload_log
         when :keys
           keys = messages.map do |m|
-            m.respond_to?(:payload) ? m.key || m.payload['message_id'] : m[:key] || m[:payload_key] || m[:payload]['message_id']
+            if m.respond_to?(:payload)
+              m.key || m.payload['message_id']
+            elsif m
+              payload = m[:payload]&.with_indifferent_access
+              m[:key] || m[:payload_key] || payload[:payload_key] || payload[:message_id]
+            end
           end
           log_message.merge!(
             payload_keys: keys

data/lib/deimos/version.rb

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

data/lib/generators/deimos/v2/templates/karafka.rb.tt

@@ -26,11 +26,11 @@ class KarafkaApp < Karafka::App
     <%- setup_configs.each do |k, v| -%>
     config.<%= k %> = <%= v.inspect %>
     <%- end -%>
-    config.kafka = {
+    config.kafka.merge!({
       <%- default_kafka_configs.compact.each do |k, v| -%>
       "<%= k.to_s %>": <%= v.inspect %>,
       <%- end -%>
-    }
+    })
     # Recreate consumers with each batch. This will allow Rails code reload to work in the
     # development mode. Otherwise Karafka process would not be aware of code changes
     config.consumer_persistence = !Rails.env.development?
@@ -104,6 +104,7 @@ class KarafkaApp < Karafka::App
         <%- consumer[:kafka].each do |k, v| -%>
         "<%= k.to_s %>": <%= v.inspect %>,
         <%- end -%>
+        inherit: true
       )
       <%- end -%>
       <%- consumer.except(:topic, :kafka).each do |k, v| -%>

data/lib/generators/deimos/v2_generator.rb

@@ -80,9 +80,9 @@ module Deimos
                                              "sasl_plain"
                                            end
                                          end
-          configs["ssl.ca.pem"] = deimos_config.kafka.ssl.ca_cert
-          configs["ssl.certificate.pem"] = deimos_config.kafka.ssl.client_cert
-          configs["ssl.key.pem"] = deimos_config.kafka.ssl.client_cert_key
+          configs["ssl.ca.location"] = deimos_config.kafka.ssl.ca_cert
+          configs["ssl.certificate.location"] = deimos_config.kafka.ssl.client_cert
+          configs["ssl.key.location"] = deimos_config.kafka.ssl.client_cert_key
           configs["ssl.endpoint.identification.algorithm"] = "https" if deimos_config.kafka.ssl.verify_hostname
           configs["sasl.kerberos.principal"] = deimos_config.kafka.sasl.gssapi_principal
           configs["sasl.kerberos.keytab"] = deimos_config.kafka.sasl.gssapi_keytab
@@ -126,6 +126,7 @@ module Deimos
               configs[:max_db_batch_size] = consumer.max_db_batch_size unless consumer.default_value?(:max_db_batch_size)
               configs[:bulk_import_id_column] = consumer.bulk_import_id_column unless consumer.default_value?(:bulk_import_id_column)
               configs[:replace_associations] = consumer.replace_associations unless consumer.default_value?(:replace_associations)
+              configs[:save_associations_first] = consumer.save_associations_first unless consumer.default_value?(:save_associations_first)
               configs[:active] = false if consumer.disabled
               configs[:each_message] = true unless consumer.delivery.to_s == 'inline_batch'
               configs
@@ -172,6 +173,9 @@ module Deimos
           template('karafka.rb.tt', "karafka.rb", force: true)
           rename_consumer_methods
           fix_specs
+          insert_into_file("Gemfile", "  gem 'karafka-testing'\n", after: "group :test do\n")
+          # to avoid inserting multiple times, just in case there isn't a single group :test
+          insert_into_file("Gemfile", "  gem 'karafka-testing'\n", after: /group .*test.* do\n/)
         end
 
       end
@@ -181,10 +185,18 @@ module Deimos
       def generate
         process_all_files
         say "Generation complete! You are safe to remove the existing initializer that configures Deimos.", :green
+        print_warnings
+      end
+
+      def print_warnings
         say "Note: The following settings cannot be determined by the generator:", :yellow
         say "*  logger / phobos_logger (dynamic object, cannot be printed out)", :yellow
         say "*  kafka.sasl.oauth_token_provider", :yellow
         say "*  producers.max_buffer_size", :yellow
+        say "*  metrics", :yellow
+        say "*  tracer", :yellow
+        say "*  consumers.bulk_import_id_generator", :yellow
+        say "*  consumer.fatal_error", :yellow
         say "*  consumer.backoff (only handles minimum, not maximum)", :yellow
         say "For more information, see https://github.com/flipp-oss/deimos/blob/master/docs/UPGRADING.md", :yellow
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha7
+  version: 2.0.0.pre.beta2
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2024-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf