ruby-kafka 0.6.0.beta1 → 0.6.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc9b975d79ef5be40b82d8f534995aa397d88a12b557f0b436bea4e42c0d7baa
-  data.tar.gz: f2e1fa46cbd12f0bc551f527aabd0469d5dd0bcc89bdcd27a71e05dedf9bd474
+  metadata.gz: a8de7c8abb93903beb344e75576f60227f42e03b4fc05cfd535b69ed71443c20
+  data.tar.gz: e23592d1e5c00e145cba041729ba69ba80a6ed7452170d6fc0a04fbb472b42cd
 SHA512:
-  metadata.gz: 60d506503b7bb77cde82b6a606bbe73ea5f8da247b4acd676a933ca91daa8e421d8beb91642469b4847725a0b6c4cfa191c74fc1f12413846b5e4bf5dd14186c
-  data.tar.gz: 9b9a7733579b0ed9c81546ea6f451df85fdbf88c9aa9ab040d81ab49f36c3d029902ae69815d07f2118a93bdf410429cd019a96d90b79b0df47eb8cbc15c2daa
+  metadata.gz: f3c7af12d2699a189d10e12117ecf06b315118fa373dc9365c50578dea3d5b1bc55f06401bd2bb044c778cf036b99daba9c4bc1a6cc6770eefa7c266ecbd0521
+  data.tar.gz: bfe265ae1b2af3024ffb10de3dc627cfda81b75916f7ade3d1537cc5ccae00dd6c134af70f5f6871be1a788e85ad2b4952db779588b59d17bd1bd1d9963b9dd4

data/README.md

@@ -924,6 +924,8 @@ Typically, Kafka certificates come in the JKS format, which isn't supported by r
 
 Kafka has support for using SASL to authenticate clients. Currently GSSAPI, SCRAM and PLAIN mechanisms are supported by ruby-kafka.
 
+**NOTE:** In order to use SASL for authentication, you need to configure SSL encryption by passing `ssl_ca_cert` or enabling `ssl_ca_certs_from_system`.
+
 ##### GSSAPI
 In order to authenticate using GSSAPI, set your principal and optionally your keytab when initializing the Kafka client:
 

data/lib/kafka.rb

@@ -44,7 +44,7 @@ module Kafka
   end
 
   class OffsetOutOfRange < ProtocolError
-    attr_accessor :topic, :partition
+    attr_accessor :topic, :partition, :offset
   end
 
   # The request is for a topic or partition that does not exist on the broker.

data/lib/kafka/client.rb

@@ -82,6 +82,10 @@ module Kafka
         logger: @logger
       )
 
+      if sasl_authenticator.enabled? && ssl_context.nil?
+        raise ArgumentError, "SASL authentication requires that SSL is configured"
+      end
+
       @connection_builder = ConnectionBuilder.new(
         client_id: client_id,
         connect_timeout: connect_timeout,
@@ -291,9 +295,16 @@ module Kafka
         instrumenter: instrumenter,
       )
 
+      fetcher = Fetcher.new(
+        cluster: initialize_cluster,
+        logger: @logger,
+        instrumenter: instrumenter,
+      )
+
       offset_manager = OffsetManager.new(
         cluster: cluster,
         group: group,
+        fetcher: fetcher,
         logger: @logger,
         commit_interval: offset_commit_interval,
         commit_threshold: offset_commit_threshold,
@@ -305,12 +316,6 @@ module Kafka
         interval: heartbeat_interval,
       )
 
-      fetcher = Fetcher.new(
-        cluster: initialize_cluster,
-        logger: @logger,
-        instrumenter: instrumenter,
-      )
-
       Consumer.new(
         cluster: cluster,
         logger: @logger,

data/lib/kafka/consumer.rb

@@ -484,7 +484,7 @@ module Kafka
         end
       end
     rescue OffsetOutOfRange => e
-      @logger.error "Invalid offset for #{e.topic}/#{e.partition}, resetting to default offset"
+      @logger.error "Invalid offset #{e.offset} for #{e.topic}/#{e.partition}, resetting to default offset"
 
       @offset_manager.seek_to_default(e.topic, e.partition)
 

data/lib/kafka/datadog.rb

@@ -32,6 +32,11 @@ module Kafka
         @statsd ||= ::Datadog::Statsd.new(host, port, namespace: namespace, tags: tags)
       end
 
+      def statsd=(statsd)
+        clear
+        @statsd = statsd
+      end
+
       def host
         @host ||= ::Datadog::Statsd::DEFAULT_HOST
       end

data/lib/kafka/fetch_operation.rb

@@ -80,6 +80,7 @@ module Kafka
             rescue Kafka::OffsetOutOfRange => e
               e.topic = fetched_topic.name
               e.partition = fetched_partition.partition
+              e.offset = topics.fetch(e.topic).fetch(e.partition).fetch(:fetch_offset)
 
               raise e
             rescue Kafka::Error => e

data/lib/kafka/offset_manager.rb

@@ -7,9 +7,10 @@ module Kafka
     # The default broker setting for offsets.retention.minutes is 1440.
     DEFAULT_RETENTION_TIME = 1440 * 60
 
-    def initialize(cluster:, group:, logger:, commit_interval:, commit_threshold:, offset_retention_time:)
+    def initialize(cluster:, group:, fetcher:, logger:, commit_interval:, commit_threshold:, offset_retention_time:)
       @cluster = cluster
       @group = group
+      @fetcher = fetcher
       @logger = logger
       @commit_interval = commit_interval
       @commit_threshold = commit_threshold
@@ -80,6 +81,8 @@ module Kafka
     def seek_to(topic, partition, offset)
       @processed_offsets[topic] ||= {}
       @processed_offsets[topic][partition] = offset
+
+      @fetcher.seek(topic, partition, offset)
     end
 
     # Return the next offset that should be fetched for the specified partition.

data/lib/kafka/sasl_authenticator.rb

@@ -28,21 +28,25 @@ module Kafka
         mechanism: sasl_scram_mechanism,
         logger: @logger,
       )
+
+      @mechanism = [@gssapi, @plain, @scram].find(&:configured?)
     end
 
-    def authenticate!(connection)
-      mechanism = [@gssapi, @plain, @scram].find(&:configured?)
+    def enabled?
+      !@mechanism.nil?
+    end
 
-      return if mechanism.nil?
+    def authenticate!(connection)
+      return unless enabled?
 
-      ident = mechanism.ident
+      ident = @mechanism.ident
       response = connection.send_request(Kafka::Protocol::SaslHandshakeRequest.new(ident))
 
       unless response.error_code == 0 && response.enabled_mechanisms.include?(ident)
         raise Kafka::Error, "#{ident} is not supported."
       end
 
-      mechanism.authenticate!(connection.to_s, connection.encoder, connection.decoder)
+      @mechanism.authenticate!(connection.to_s, connection.encoder, connection.decoder)
     end
   end
 end

data/lib/kafka/version.rb

@@ -1,3 +1,3 @@
 module Kafka
-  VERSION = "0.6.0.beta1"
+  VERSION = "0.6.0.beta2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-kafka
 version: !ruby/object:Gem::Version
-  version: 0.6.0.beta1
+  version: 0.6.0.beta2
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler