logstash-input-kafka 8.0.6 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8b7a72f9e1639f7eedfcb6fe6276f719a2fac291a3432a865a6fa649a26b745
-  data.tar.gz: 16e6a9a1236a40e4ac99ec1629a4819bd2172706b3015293ccb3ed5108d109ff
+  metadata.gz: 41c9c935b07986088ac8bc74eb77c3b88f4da3ecbe101ccb521df6bafbce84a3
+  data.tar.gz: 36dc41dae7fb79a1fce3a0d472bf08038fbb3fe9cd74038cc375e1fc893d3f33
 SHA512:
-  metadata.gz: 72ae3ef6ed1de4eed323751e38a7a697d8637e76537c15ba1ea65796d623aa1985ac5b5e88133f7484157314c1b21afa2aaea27fd9429a5af044681d0a5f6aab
-  data.tar.gz: 2f2fe978fd890db6e42cd6b5a037163a21d492772c897ee10f87f9833d644a0c4dfd0a4612ce8acf8d1bfdb83b2d6cc49abe4855642ae1283aa95cf13c8a9797
+  metadata.gz: ebe51386d2c1ceaf2208ad7d8a136c327d69c12a1f94190d8d1555b69cfb795b67d2fa00e3b1d1800a1c81aba82912c2f90f8e33f16ef44ce633905a2284d321
+  data.tar.gz: c09e3d04d27bb9df97d77dfe082c9f8e23ebbd027dc67d1f5ef146aab0d555665850f9e2b54b3d75e59e24afca97aca5614270989ece5284940357f5d22f4658

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 8.1.0
+  - Internal: Update build to gradle
+  - Upgrade Kafka client to version 1.1.0
+
 ## 8.0.6
   - Fix broken 8.0.5 release
 

data/docs/index.asciidoc

@@ -23,10 +23,9 @@ include::{include_path}/plugin_header.asciidoc[]
 
 This input will read events from a Kafka topic.
 
-This plugin uses Kafka Client 1.0.0. For broker compatibility, see the official https://cwiki.apache.org/confluence/display/KAFKA/Compatibility+Matrix[Kafka compatibility reference].
-
-If you're using a plugin version that was released after {version}, see the https://www.elastic.co/guide/en/logstash/master/plugins-inputs-kafka.html[latest plugin documentation] for updated information about Kafka compatibility. If you require features not yet available in this plugin (including client version upgrades), please file an issue with details about what you need..
+This plugin uses Kafka Client 1.1.0. For broker compatibility, see the official https://cwiki.apache.org/confluence/display/KAFKA/Compatibility+Matrix[Kafka compatibility reference]. If the linked compatibility wiki is not up-to-date, please contact Kafka support/community to confirm compatibility.
 
+If you require features not yet available in this plugin (including client version upgrades), please file an issue with details about what you need.
 
 This input supports connecting to Kafka over:
 
@@ -543,4 +542,4 @@ Java Class used to deserialize the record's value
 [id="plugins-{type}s-{plugin}-common-options"]
 include::{include_path}/{type}.asciidoc[]
 
-:default_codec!:
+:default_codec!:

data/lib/logstash-input-kafka_jars.rb

@@ -1,5 +1,7 @@
-# encoding: utf-8
-require 'logstash/environment'
+# AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
 
-root_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-LogStash::Environment.load_runtime_jars! File.join(root_dir, "vendor")
+require 'jar_dependencies'
+require_jar('org.apache.kafka', 'kafka-clients', '1.1.0')
+require_jar('org.slf4j', 'slf4j-api', '1.7.25')
+require_jar('org.lz4', 'lz4-java', '1.4')
+require_jar('org.xerial.snappy', 'snappy-java', '1.1.7.1')

data/lib/logstash/inputs/kafka.rb

@@ -250,6 +250,7 @@ class LogStash::Inputs::Kafka < LogStash::Inputs::Base
         codec_instance = @codec.clone
         while !stop?
           records = consumer.poll(poll_timeout_ms)
+          next unless records.count > 0
           for record in records do
             codec_instance.decode(record.value.to_s) do |event|
               decorate(event)
@@ -326,7 +327,7 @@ class LogStash::Inputs::Kafka < LogStash::Inputs::Base
       logger.error("Unable to create Kafka consumer from given configuration",
                    :kafka_error_message => e,
                    :cause => e.respond_to?(:getCause) ? e.getCause() : nil)
-      throw e
+      raise e
     end
   end
 

data/logstash-input-kafka.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-input-kafka'
-  s.version         = '8.0.6'
+  s.version         = '8.1.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Reads events from 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"
   s.authors         = ['Elasticsearch']
   s.email           = 'info@elastic.co'
   s.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
-  s.require_paths = ['lib']
+  s.require_paths = ['lib', 'vendor/jar-dependencies']
 
   # Files
   s.files = Dir["lib/**/*","spec/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "vendor/jar-dependencies/**/*.jar", "vendor/jar-dependencies/**/*.rb", "VERSION", "docs/**/*"]
@@ -18,9 +18,6 @@ Gem::Specification.new do |s|
   # Special flag to let us know this is actually a logstash plugin
   s.metadata = { 'logstash_plugin' => 'true', 'logstash_group' => 'input'}
 
-  s.requirements << "jar 'org.apache.kafka:kafka-clients', '1.0.0'"
-  s.requirements << "jar 'org.apache.logging.log4j:log4j-slf4j-impl', '2.8.2'"
-
   s.add_development_dependency 'jar-dependencies', '~> 0.3.2'
 
   # Gem dependencies

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-kafka
 version: !ruby/object:Gem::Version
-  version: 8.0.6
+  version: 8.1.0
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -138,21 +138,13 @@ files:
 - docs/index.asciidoc
 - lib/logstash-input-kafka_jars.rb
 - lib/logstash/inputs/kafka.rb
-- lib/org/apache/kafka/kafka-clients/1.0.0/kafka-clients-1.0.0.jar
-- lib/org/apache/logging/log4j/log4j-api/2.8.2/log4j-api-2.8.2.jar
-- lib/org/apache/logging/log4j/log4j-slf4j-impl/2.8.2/log4j-slf4j-impl-2.8.2.jar
-- lib/org/lz4/lz4-java/1.4/lz4-java-1.4.jar
-- lib/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar
-- lib/org/xerial/snappy/snappy-java/1.1.4/snappy-java-1.1.4.jar
 - logstash-input-kafka.gemspec
 - spec/integration/inputs/kafka_spec.rb
 - spec/unit/inputs/kafka_spec.rb
-- vendor/jar-dependencies/runtime-jars/kafka-clients-1.0.0.jar
-- vendor/jar-dependencies/runtime-jars/log4j-api-2.8.2.jar
-- vendor/jar-dependencies/runtime-jars/log4j-slf4j-impl-2.8.2.jar
-- vendor/jar-dependencies/runtime-jars/lz4-java-1.4.jar
-- vendor/jar-dependencies/runtime-jars/slf4j-api-1.7.25.jar
-- vendor/jar-dependencies/runtime-jars/snappy-java-1.1.4.jar
+- vendor/jar-dependencies/org/apache/kafka/kafka-clients/1.1.0/kafka-clients-1.1.0.jar
+- vendor/jar-dependencies/org/lz4/lz4-java/1.4/lz4-java-1.4.jar
+- vendor/jar-dependencies/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar
+- vendor/jar-dependencies/org/xerial/snappy/snappy-java/1.1.7.1/snappy-java-1.1.7.1.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -163,6 +155,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- vendor/jar-dependencies
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -173,11 +166,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- jar 'org.apache.kafka:kafka-clients', '1.0.0'
-- jar 'org.apache.logging.log4j:log4j-slf4j-impl', '2.8.2'
+requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Reads events from a Kafka topic