logstash-output-kafka 7.3.2 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a10de2fd3b875b0349bfd81afdc25808cc90c90599868f176e73e3758614821d
-  data.tar.gz: b3682d3204b4b5304a78b6a64e2f2300f8890ef80805c82cd507999f94514f8d
+  metadata.gz: a981761a88f5164e806a8905d0029f5c9cae7c0e8c3c3fcda75a6c2f0e1ba376
+  data.tar.gz: dfff30a2b2945f37011d6c017ef24a3a4d59364a4f89b71cdc828990299ce848
 SHA512:
-  metadata.gz: e1555e10e79b349cab59d256c353718bd415a58ebcf2c698437da45fd14a92c07cff21e1122cf349e768d3d6883f74532a363ee19d0d27a094dd3e73b2a62275
-  data.tar.gz: 2163e214ab7306f8fd92176e0e72b6d7d792c79831fcd1eb64a305bd1c7d2d5e28cf0f3b1e2d0d24a8e774b86b2c7be43bc32eeb60aee86903ee7648e1b936ac
+  metadata.gz: 95dd113a68bef32a2f2fcfca611ae82d11087697af6ea13ba122ffc070da65a4bacf9019d3db1a60f8d16a1d65d09dc3e1a682e3a26f1fc37405e75a88b7dfc1
+  data.tar.gz: f86de71028de564096d0f85f1d46e95edee7c7fe84834f2e44115934da43a008019cef0ad5956f478e8bad968b16f84ebfdf6024e05c8b100fd18af879041acf

data/CHANGELOG.md

@@ -1,5 +1,5 @@
-## 7.3.2
-  - Fixed issue with unnecessary sleep after retries exhausted [#216](https://github.com/logstash-plugins/logstash-output-kafka/pull/216)
+## 8.0.0
+  - Removed obsolete `block_on_buffer_full`, `ssl` and `timeout_ms` options
 
 ## 7.3.1
   - Added support for kafka property `ssl.endpoint.identification.algorithm` [#213](https://github.com/logstash-plugins/logstash-output-kafka/pull/213)

data/lib/logstash/outputs/kafka.rb

@@ -73,8 +73,6 @@ class LogStash::Outputs::Kafka < LogStash::Outputs::Base
   # `host1:port1,host2:port2`, and the list can be a subset of brokers or a VIP pointing to a
   # subset of brokers.
   config :bootstrap_servers, :validate => :string, :default => 'localhost:9092'
-
-  config :block_on_buffer_full, :validate => :boolean, :obsolete => "This options is obsolete"
   # The total bytes of memory the producer can use to buffer records waiting to be sent to the server.
   config :buffer_memory, :validate => :number, :default => 33554432
   # The compression type for all data generated by the producer.
@@ -124,8 +122,6 @@ class LogStash::Outputs::Kafka < LogStash::Outputs::Base
   config :retry_backoff_ms, :validate => :number, :default => 100
   # The size of the TCP send buffer to use when sending data.
   config :send_buffer_bytes, :validate => :number, :default => 131072
-  # Enable SSL/TLS secured communication to Kafka broker.
-  config :ssl, :validate => :boolean, :obsolete => "Use security_protocol => 'SSL'"
   # The truststore type.
   config :ssl_truststore_type, :validate => :string
   # The JKS truststore path to validate the Kafka broker's certificate.
@@ -171,8 +167,6 @@ class LogStash::Outputs::Kafka < LogStash::Outputs::Base
   # Optional path to kerberos config file. This is krb5.conf style as detailed in https://web.mit.edu/kerberos/krb5-1.12/doc/admin/conf_files/krb5_conf.html
   config :kerberos_config, :validate => :path
 
-  config :timeout_ms, :validate => :number, :obsolete => "This option is obsolete. Please use request_timeout_ms"
-
   # The topic to produce messages to
   config :topic_id, :validate => :string, :required => true
   # Serializer class for the value of the message
@@ -231,7 +225,7 @@ class LogStash::Outputs::Kafka < LogStash::Outputs::Base
   end
 
   def retrying_send(batch)
-    remaining = @retries
+    remaining = @retries;
 
     while batch.any?
       if !remaining.nil?
@@ -281,15 +275,13 @@ class LogStash::Outputs::Kafka < LogStash::Outputs::Base
       break if failures.empty?
 
       # Otherwise, retry with any failed transmissions
-      if remaining.nil? || remaining >= 0
-        delay = @retry_backoff_ms / 1000.0
-        logger.info("Sending batch to Kafka failed. Will retry after a delay.", :batch_size => batch.size,
-                                                                                :failures => failures.size,
-                                                                                :sleep => delay)
-        batch = failures
-        sleep(delay)
-      end
+      batch = failures
+      delay = @retry_backoff_ms / 1000.0
+      logger.info("Sending batch to Kafka failed. Will retry after a delay.", :batch_size => batch.size,
+                  :failures => failures.size, :sleep => delay);
+      sleep(delay)
     end
+
   end
 
   def close

data/logstash-output-kafka.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-kafka'
-  s.version         = '7.3.2'
+  s.version         = '8.0.0'
   s.licenses        = ['Apache-2.0']
   s.summary         = "Writes events to a Kafka topic"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/unit/outputs/kafka_spec.rb

@@ -49,7 +49,7 @@ describe "outputs/kafka" do
       kafka.register
       kafka.multi_receive([event])
     end
-
+    
     it 'should raise config error when truststore location is not set and ssl is enabled' do
       kafka = LogStash::Outputs::Kafka.new(simple_kafka_config.merge("security_protocol" => "SSL"))
       expect { kafka.register }.to raise_error(LogStash::ConfigurationError, /ssl_truststore_location must be set when SSL is enabled/)
@@ -120,41 +120,6 @@ describe "outputs/kafka" do
       end
     end
 
-    context 'when retries is 0' do
-      let(:retries) { 0  }
-      let(:max_sends) { 1 }
-
-      it "should should only send once" do
-        expect_any_instance_of(org.apache.kafka.clients.producer.KafkaProducer).to receive(:send)
-                                                                                       .once
-                                                                                       .and_wrap_original do |m, *args|
-          # Always fail.
-          future = java.util.concurrent.FutureTask.new { raise "Failed" }
-          future.run
-          future
-        end
-        kafka = LogStash::Outputs::Kafka.new(simple_kafka_config.merge("retries" => retries))
-        kafka.register
-        kafka.multi_receive([event])
-      end
-
-      it 'should not sleep' do
-        expect_any_instance_of(org.apache.kafka.clients.producer.KafkaProducer).to receive(:send)
-                                                                                       .once
-                                                                                       .and_wrap_original do |m, *args|
-          # Always fail.
-          future = java.util.concurrent.FutureTask.new { raise "Failed" }
-          future.run
-          future
-        end
-
-        kafka = LogStash::Outputs::Kafka.new(simple_kafka_config.merge("retries" => retries))
-        expect(kafka).not_to receive(:sleep).with(anything)
-        kafka.register
-        kafka.multi_receive([event])
-      end
-    end
-
     context "and when retries is set by the user" do
       let(:retries) { (rand * 10).to_i }
       let(:max_sends) { retries + 1 }
@@ -172,21 +137,6 @@ describe "outputs/kafka" do
         kafka.register
         kafka.multi_receive([event])
       end
-
-      it 'should only sleep retries number of times' do
-        expect_any_instance_of(org.apache.kafka.clients.producer.KafkaProducer).to receive(:send)
-                                                                                       .at_most(max_sends)
-                                                                                       .and_wrap_original do |m, *args|
-          # Always fail.
-          future = java.util.concurrent.FutureTask.new { raise "Failed" }
-          future.run
-          future
-        end
-        kafka = LogStash::Outputs::Kafka.new(simple_kafka_config.merge("retries" => retries))
-        expect(kafka).to receive(:sleep).exactly(retries).times
-        kafka.register
-        kafka.multi_receive([event])
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-kafka
 version: !ruby/object:Gem::Version
-  version: 7.3.2
+  version: 8.0.0
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement