logstash-integration-kafka 10.0.0-java → 10.4.0-java

data/spec/unit/inputs/kafka_spec.rb

@@ -34,6 +34,68 @@ describe LogStash::Inputs::Kafka do
   subject { LogStash::Inputs::Kafka.new(config) }
 
   it "should register" do
-    expect {subject.register}.to_not raise_error
+    expect { subject.register }.to_not raise_error
+  end
+
+  context 'with client_rack' do
+    let(:config) { super.merge('client_rack' => 'EU-R1') }
+
+    it "sets broker rack parameter" do
+      expect(org.apache.kafka.clients.consumer.KafkaConsumer).
+          to receive(:new).with(hash_including('client.rack' => 'EU-R1')).
+              and_return kafka_client = double('kafka-consumer')
+
+      expect( subject.send(:create_consumer, 'sample_client-0') ).to be kafka_client
+    end
+  end
+
+  context 'string integer config' do
+    let(:config) { super.merge('session_timeout_ms' => '25000', 'max_poll_interval_ms' => '345000') }
+
+    it "sets integer values" do
+      expect(org.apache.kafka.clients.consumer.KafkaConsumer).
+          to receive(:new).with(hash_including('session.timeout.ms' => '25000', 'max.poll.interval.ms' => '345000')).
+              and_return kafka_client = double('kafka-consumer')
+
+      expect( subject.send(:create_consumer, 'sample_client-1') ).to be kafka_client
+    end
+  end
+
+  context 'integer config' do
+    let(:config) { super.merge('session_timeout_ms' => 25200, 'max_poll_interval_ms' => 123_000) }
+
+    it "sets integer values" do
+      expect(org.apache.kafka.clients.consumer.KafkaConsumer).
+          to receive(:new).with(hash_including('session.timeout.ms' => '25200', 'max.poll.interval.ms' => '123000')).
+              and_return kafka_client = double('kafka-consumer')
+
+      expect( subject.send(:create_consumer, 'sample_client-2') ).to be kafka_client
+    end
+  end
+
+  context 'string boolean config' do
+    let(:config) { super.merge('enable_auto_commit' => 'false', 'check_crcs' => 'true') }
+
+    it "sets parameters" do
+      expect(org.apache.kafka.clients.consumer.KafkaConsumer).
+          to receive(:new).with(hash_including('enable.auto.commit' => 'false', 'check.crcs' => 'true')).
+              and_return kafka_client = double('kafka-consumer')
+
+      expect( subject.send(:create_consumer, 'sample_client-3') ).to be kafka_client
+      expect( subject.enable_auto_commit ).to be false
+    end
+  end
+
+  context 'boolean config' do
+    let(:config) { super.merge('enable_auto_commit' => true, 'check_crcs' => false) }
+
+    it "sets parameters" do
+      expect(org.apache.kafka.clients.consumer.KafkaConsumer).
+          to receive(:new).with(hash_including('enable.auto.commit' => 'true', 'check.crcs' => 'false')).
+              and_return kafka_client = double('kafka-consumer')
+
+      expect( subject.send(:create_consumer, 'sample_client-4') ).to be kafka_client
+      expect( subject.enable_auto_commit ).to be true
+    end
   end
 end

data/spec/unit/outputs/kafka_spec.rb

@@ -16,9 +16,9 @@ describe "outputs/kafka" do
 
     it 'should populate kafka config with default values' do
       kafka = LogStash::Outputs::Kafka.new(simple_kafka_config)
-      insist {kafka.bootstrap_servers} == 'localhost:9092'
-      insist {kafka.topic_id} == 'test'
-      insist {kafka.key_serializer} == 'org.apache.kafka.common.serialization.StringSerializer'
+      expect(kafka.bootstrap_servers).to eql 'localhost:9092'
+      expect(kafka.topic_id).to eql 'test'
+      expect(kafka.key_serializer).to eql 'org.apache.kafka.common.serialization.StringSerializer'
     end
   end
 
@@ -55,7 +55,7 @@ describe "outputs/kafka" do
       expect { kafka.register }.to raise_error(LogStash::ConfigurationError, /ssl_truststore_location must be set when SSL is enabled/)
     end
   end
-  
+
   context "when KafkaProducer#send() raises an exception" do
     let(:failcount) { (rand * 10).to_i }
     let(:sendcount) { failcount + 1 }
@@ -97,7 +97,7 @@ describe "outputs/kafka" do
       let(:sendcount) { failcount + 1 }
 
       it "should retry until successful" do
-        count = 0;
+        count = 0
 
         expect_any_instance_of(org.apache.kafka.clients.producer.KafkaProducer).to receive(:send)
               .exactly(sendcount).times
@@ -189,4 +189,25 @@ describe "outputs/kafka" do
       end
     end
   end
+
+  context 'when ssl endpoint identification disabled' do
+
+    let(:config) do
+      simple_kafka_config.merge('ssl_endpoint_identification_algorithm' => '', 'security_protocol' => 'SSL')
+    end
+
+    subject { LogStash::Outputs::Kafka.new(config) }
+
+    it 'does not configure truststore' do
+      expect(org.apache.kafka.clients.producer.KafkaProducer).
+          to receive(:new).with(hash_excluding('ssl.truststore.location' => anything))
+      subject.register
+    end
+
+    it 'sets empty ssl.endpoint.identification.algorithm' do
+      expect(org.apache.kafka.clients.producer.KafkaProducer).
+          to receive(:new).with(hash_including('ssl.endpoint.identification.algorithm' => ''))
+      subject.register
+    end
+  end
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-kafka
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 10.4.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.12
   name: jar-dependencies
@@ -21,7 +21,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.12
 - !ruby/object:Gem::Dependency
@@ -140,7 +140,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: poseidon
+  name: ruby-kafka
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
@@ -188,10 +188,10 @@ files:
 - spec/integration/outputs/kafka_spec.rb
 - spec/unit/inputs/kafka_spec.rb
 - spec/unit/outputs/kafka_spec.rb
-- vendor/jar-dependencies/com/github/luben/zstd-jni/1.4.2-1/zstd-jni-1.4.2-1.jar
-- vendor/jar-dependencies/org/apache/kafka/kafka-clients/2.3.0/kafka-clients-2.3.0.jar
+- vendor/jar-dependencies/com/github/luben/zstd-jni/1.4.3-1/zstd-jni-1.4.3-1.jar
+- vendor/jar-dependencies/org/apache/kafka/kafka-clients/2.4.1/kafka-clients-2.4.1.jar
 - vendor/jar-dependencies/org/lz4/lz4-java/1.6.0/lz4-java-1.6.0.jar
-- vendor/jar-dependencies/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar
+- vendor/jar-dependencies/org/slf4j/slf4j-api/1.7.28/slf4j-api-1.7.28.jar
 - vendor/jar-dependencies/org/xerial/snappy/snappy-java/1.1.7.3/snappy-java-1.1.7.3.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.14
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Integration with Kafka - input and output plugins