karafka 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc0f99f61db358d26a8e65c677c387a4dc18ada9fb3a0fba91d512408fe6045c
-  data.tar.gz: 9c5f338634cf431aa8f69b75cc18540a6a223cfb613691a92c4ce4eacb3a8914
+  metadata.gz: b4de7fea7ee892f9c83db91dea9e3d16d48d423985477d3f40440bea77907906
+  data.tar.gz: ccfe4744b3bb2c19b31032e8f904716116faa50f96a9be19a4e3cdc79364ebe6
 SHA512:
-  metadata.gz: 41f1615ac9cf15f9a8fe8b511836399634298a94c6249e9ac09449d82138c5af073e593b127129fa9bf7ed336758b2095372c0fb271a998d7db843e6f8a53a2c
-  data.tar.gz: cbf4dbfb337cda933e21d9ecd6ffd3f37fbe58b4ced9a0b48a5124837de2b8656ca0caa0a1f94fc5c14c4d6e9c2073e25c94c224571d4a514bab9bb052fed9f2
+  metadata.gz: 74dbf97aec22f4e0f5f9a07ac9b0457c09846332c65f548d30e2b0342a2adec4b8542004aa1937012892f3374b39f83f557ef5adecacc40ae538290842165150
+  data.tar.gz: fa2072670fe7c17720e593373a4d8222163f4e789c68ec72e4e1f58f4a08688839a0c01e98115db4dfbc5c57d633b0251fe481fc9838362203961c1e4e236159

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Karafka framework changelog
 
+## 1.3.6 (2020-04-24)
+- #583 - Use Karafka.logger for CLI messages (prikha)
+- #582 - Cannot only define seed brokers in consumer groups
+
 ## 1.3.5 (2020-04-02)
 - #578 - ThreadError: can't be called from trap context patch
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    karafka (1.3.5)
+    karafka (1.3.6)
       dry-configurable (~> 0.8)
       dry-inflector (~> 0.1)
       dry-monitor (~> 0.3)
@@ -24,7 +24,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2)
-    byebug (11.1.1)
+    byebug (11.1.3)
     concurrent-ruby (1.1.6)
     delivery_boy (1.0.1)
       king_konf (~> 0.3)
@@ -52,11 +52,11 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-monitor (0.3.1)
+    dry-monitor (0.3.2)
       dry-configurable (~> 0.5)
       dry-core (~> 0.4)
       dry-equalizer (~> 0.2)
-      dry-events (~> 0.1)
+      dry-events (~> 0.2)
     dry-schema (1.5.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
@@ -79,7 +79,7 @@ GEM
       dry-equalizer (~> 0.2)
       dry-initializer (~> 3.0)
       dry-schema (~> 1.5)
-    envlogic (1.1.0)
+    envlogic (1.1.2)
       dry-inflector (~> 0.1)
     factory_bot (5.1.2)
       activesupport (>= 4.2.0)

data/README.md

@@ -2,11 +2,11 @@
 
 [![Build Status](https://travis-ci.org/karafka/karafka.svg?branch=master)](https://travis-ci.org/karafka/karafka)
 
-**Note**: Documentation presented here refers to Karafka `1.3.0`.
+**Note**: Documentation presented here refers to Karafka `1.3.x`.
 
 If you're upgrading from `1.2.0`, please refer to our [Upgrade Notes article](https://mensfeld.pl/2019/09/karafka-framework-1-3-0-release-notes-ruby-kafka/).
 
-If you are looking for the documentation for Karafka `1.2.*`, it can be found [here](https://github.com/karafka/wiki/tree/1.2).
+If you are looking for the documentation for Karafka `1.2.x`, it can be found [here](https://github.com/karafka/wiki/tree/1.2).
 
 ## About Karafka
 

data/lib/karafka/cli.rb

@@ -47,7 +47,7 @@ end
 if ENV['KARAFKA_CONSOLE']
   # Reloads Karafka irb console session
   def reload!
-    puts "Reloading...\n"
+    Karafka.logger.info "Reloading...\n"
     Kernel.exec Karafka::Cli::Console.command
   end
 end

data/lib/karafka/cli/flow.rb

@@ -11,19 +11,22 @@ module Karafka
       def call
         topics.each do |topic|
           any_topics = !topic.responder&.topics.nil?
+          log_messages = []
 
           if any_topics
-            puts "#{topic.name} =>"
+            log_messages << "#{topic.name} =>"
 
             topic.responder.topics.each_value do |responder_topic|
               features = []
               features << (responder_topic.required? ? 'always' : 'conditionally')
 
-              print responder_topic.name, "(#{features.join(', ')})"
+              log_messages << format(responder_topic.name, "(#{features.join(', ')})")
             end
           else
-            puts "#{topic.name} => (nothing)"
+            log_messages << "#{topic.name} => (nothing)"
           end
+
+          Karafka.logger.info(log_messages.join("\n"))
         end
       end
 
@@ -34,15 +37,11 @@ module Karafka
         Karafka::App.consumer_groups.map(&:topics).flatten.sort_by(&:name)
       end
 
-      # Prints a given value with label in a nice way
+      # Formats a given value with label in a nice way
       # @param label [String] label describing value
       # @param value [String] value that should be printed
-      def print(label, value)
-        printf(
-          "%<label>-25s %<value>s\n",
-          label: "  - #{label}:",
-          value: value
-        )
+      def format(label, value)
+        "  - #{label}:                #{value}"
       end
     end
   end

data/lib/karafka/cli/info.rb

@@ -24,7 +24,7 @@ module Karafka
           "Kafka seed brokers: #{config.kafka.seed_brokers}"
         ]
 
-        puts(info.join("\n"))
+        Karafka.logger.info(info.join("\n"))
       end
     end
   end

data/lib/karafka/connection/api_adapter.rb

@@ -14,11 +14,12 @@ module Karafka
     module ApiAdapter
       class << self
         # Builds all the configuration settings for Kafka.new method
+        # @param consumer_group [Karafka::Routing::ConsumerGroup] consumer group details
         # @return [Array<Hash>] Array with all the client arguments including hash with all
         #   the settings required by Kafka.new method
         # @note We return array, so we can inject any arguments we want, in case of changes in the
         #   raw driver
-        def client
+        def client(consumer_group)
           # This one is a default that takes all the settings except special
           # cases defined in the map
           settings = {
@@ -26,14 +27,17 @@ module Karafka
             client_id: ::Karafka::App.config.client_id
           }
 
-          kafka_configs.each do |setting_name, setting_value|
+          kafka_configs.each_key do |setting_name|
             # All options for config adapter should be ignored as we're just interested
             # in what is left, as we want to pass all the options that are "typical"
             # and not listed in the api_adapter special cases mapping. All the values
             # from the api_adapter mapping go somewhere else, not to the client directly
             next if AttributesMap.api_adapter.values.flatten.include?(setting_name)
 
-            settings[setting_name] = setting_value
+            # Settings for each consumer group are either defined per consumer group or are
+            # inherited from the global/general settings level, thus we don't have to fetch them
+            # from the kafka settings as they are already on a consumer group level
+            settings[setting_name] = consumer_group.public_send(setting_name)
           end
 
           settings_hash = sanitize(settings)

data/lib/karafka/connection/builder.rb

@@ -6,9 +6,11 @@ module Karafka
     module Builder
       class << self
         # Builds a Kafka::Client instance that we use to work with Kafka cluster
+        # @param consumer_group [Karafka::Routing::ConsumerGroup] consumer group for which we want
+        #   to have a new Kafka client
         # @return [::Kafka::Client] returns a Kafka client
-        def call
-          Kafka.new(*ApiAdapter.client)
+        def call(consumer_group)
+          Kafka.new(*ApiAdapter.client(consumer_group))
         end
       end
     end

data/lib/karafka/connection/client.rb

@@ -97,7 +97,7 @@ module Karafka
       def kafka_consumer
         # @note We don't cache the connection internally because we cache kafka_consumer that uses
         #   kafka client object instance
-        @kafka_consumer ||= Builder.call.consumer(
+        @kafka_consumer ||= Builder.call(consumer_group).consumer(
           *ApiAdapter.consumer(consumer_group)
         ).tap do |consumer|
           consumer_group.topics.each do |topic|

data/lib/karafka/version.rb

@@ -3,5 +3,5 @@
 # Main module namespace
 module Karafka
   # Current Karafka version
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -36,7 +36,7 @@ cert_chain:
   KJG/fhg1JV5vVDdVy6x+tv5SQ5ctU0feCsVfESi3rE3zRd+nvzE9HcZ5aXeL1UtJ
   nT5Xrioegu2w1jPyVEgyZgTZC5rvD0nNS5sFNQ==
   -----END CERTIFICATE-----
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable

metadata.gz.sig

@@ -1,2 +1,3 @@
-C��_
-'/�.�%���Ƈ�fsS7�� V@���3�M�'��"��
ٕ�AĿ���u�	�O�}s(�?����8ϰ�Y����'�(�._@�:���p�����[p��~���+쮞������k]l���.T�C�@)��;�U�X�E����`��6�����A2}��̖}�c<vȓ�^HⰬʴU,����x'*<*"@Vè������ W��E��F|��u-!\�л��BR|��w[�B�$5r��H�����g�c����=S�8��1 xa������H^��(1�;h��>���k��� �>������������G�%�ǟs�<����\��,�d�H�%*���
+?ϒ�ѩȹ�t�!D2~�}7^zb���IE��=	���%@��u"����>���`���Ӆ�;E@���%��vag�"�&���?3�<_R}�]�M:	mf����j�U���l�������؋�4��l3	U���������\Qe������
+��
+yE)G'!�IJ�|�f-aD�~d$RoU˔�?��ԇ%,r�����ݩ������'-;�����_sS���?�n��ۀ���|��1��*�(�{�t9�,���#�(�h�J8?�pskR6��f����=)�hJT����⭽���d5��]���g�S�s};�/=�Ľȭ:�b�D�i�W�˒�-f�	{q{�+?2����w��Cz����%�