logstash-integration-kafka 11.2.0-java → 11.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f4d4eeff4c13ac6151467cb7998742151a2829a18b05d6a74377edd7acab7fc
-  data.tar.gz: 22fc71adaf29c11b9f0090436dc2e330a1a21eefc8fceb3aa4b4063f2adad626
+  metadata.gz: 2a71a06cb2805f4a474eb2f3cb25cf15e4612e4d29e785c1ba6c8b7d86e392ae
+  data.tar.gz: 43eee87ac19ec950267d14b712e48d01d1961819172a350c8f384dfaced9b103
 SHA512:
-  metadata.gz: 4ae9306a90795f0d877e896ee79e2c7ecd46b1c7033bca2d3182a5b0b4dbc66b50502d23c39a70451b5a7b83013763232e8e7a8a5dba8958d237831e2808ce6a
-  data.tar.gz: 5e4e48213df61f86cabf5e3535fc4f2c424714b904e12b0076812c832793b243ebbf54376edd90f9490e67f0a8268f290296be9570fa71704b626acd51ee92de
+  metadata.gz: 88b9f88f55b566d98468556c94bba80eb955441c04c4cb154bf769dd30c2a156f6509b55c2c35f4ca352c1c838084832472bf97d8a8a9a198aac7a5778be3888
+  data.tar.gz: 35c5d8829cf5108afab37ddcff500afb0e35029200c298ffa1e28d7dd21166761a6df0ff1acb6b423a8176cc0b312bab7df186b7f5539e7aa1dbe4ccaf1409b9

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 11.3.0
+  - Bump kafka client to 3.4.1 [#145](https://github.com/logstash-plugins/logstash-integration-kafka/pull/145)
+
+## 11.2.1
+ - Fix nil exception to empty headers of record during event metadata assignment [#140](https://github.com/logstash-plugins/logstash-integration-kafka/pull/140)
+
 ## 11.2.0
  - Added TLS truststore and keystore settings specifically to access the schema registry [#137](https://github.com/logstash-plugins/logstash-integration-kafka/pull/137)
 

data/docs/index.asciidoc

@@ -1,7 +1,7 @@
 :plugin: kafka
 :type: integration
 :no_codec:
-:kafka_client: 3.3.1
+:kafka_client: 3.4.1
 
 ///////////////////////////////////////////
 START - GENERATED VARIABLES, DO NOT EDIT!

data/docs/input-kafka.asciidoc

@@ -2,8 +2,8 @@
 :plugin: kafka
 :type: input
 :default_codec: plain
-:kafka_client: 3.3
-:kafka_client_doc: 33
+:kafka_client: 3.4
+:kafka_client_doc: 34
 
 ///////////////////////////////////////////
 START - GENERATED VARIABLES, DO NOT EDIT!

data/docs/output-kafka.asciidoc

@@ -2,8 +2,8 @@
 :plugin: kafka
 :type: output
 :default_codec: plain
-:kafka_client: 3.3
-:kafka_client_doc: 33
+:kafka_client: 3.4
+:kafka_client_doc: 34
 
 ///////////////////////////////////////////
 START - GENERATED VARIABLES, DO NOT EDIT!

data/lib/logstash/inputs/kafka.rb

@@ -373,7 +373,9 @@ class LogStash::Inputs::Kafka < LogStash::Inputs::Base
       event.set("[@metadata][kafka][timestamp]", record.timestamp)
     end
     if @metadata_mode.include?(:headers)
-      record.headers.each do |header|
+      record.headers
+            .select{|h| header_with_value(h) }
+            .each do |header|
         s = String.from_java_bytes(header.value)
         s.force_encoding(Encoding::UTF_8)
         if s.valid_encoding?
@@ -499,4 +501,8 @@ class LogStash::Inputs::Kafka < LogStash::Inputs::Base
     end
   end
 
+  def header_with_value(header)
+    !header.nil? && !header.value.nil? && !header.key.nil?
+  end
+
 end #class LogStash::Inputs::Kafka

data/lib/logstash-integration-kafka_jars.rb

@@ -1,17 +1,12 @@
 # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
 
 require 'jar_dependencies'
-require_jar('io.confluent', 'kafka-avro-serializer', '7.3.0')
-require_jar('io.confluent', 'kafka-schema-serializer', '7.3.0')
-require_jar('io.confluent', 'common-config', '7.3.0')
-require_jar('org.apache.avro', 'avro', '1.11.0')
-require_jar('io.confluent', 'kafka-schema-registry-client', '7.3.0')
-require_jar('org.apache.kafka', 'kafka_2.12', '3.3.1')
-require_jar('io.confluent', 'common-utils', '7.3.0')
-require_jar('javax.ws.rs', 'javax.ws.rs-api', '2.1.1')
-require_jar('org.glassfish.jersey.core', 'jersey-common', '2.33')
-require_jar('org.apache.kafka', 'kafka-clients', '3.3.1')
-require_jar('com.github.luben', 'zstd-jni', '1.5.2-2')
+require_jar('io.confluent', 'kafka-avro-serializer', '7.4.0')
+require_jar('io.confluent', 'kafka-schema-serializer', '7.4.0')
+require_jar('org.apache.avro', 'avro', '1.11.1')
+require_jar('io.confluent', 'kafka-schema-registry-client', '7.4.0')
+require_jar('org.apache.kafka', 'kafka-clients', '3.4.1')
 require_jar('org.slf4j', 'slf4j-api', '1.7.36')
+require_jar('com.github.luben', 'zstd-jni', '1.5.5-4')
 require_jar('org.lz4', 'lz4-java', '1.8.0')
-require_jar('org.xerial.snappy', 'snappy-java', '1.1.8.4')
+require_jar('org.xerial.snappy', 'snappy-java', '1.1.10.1')

data/logstash-integration-kafka.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-integration-kafka'
-  s.version         = '11.2.0'
+  s.version         = '11.3.0'
   s.licenses        = ['Apache-2.0']
   s.summary         = "Integration with Kafka - input and output plugins"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline "+

data/spec/unit/inputs/kafka_spec.rb

@@ -287,6 +287,19 @@ describe LogStash::Inputs::Kafka do
       subject.register
       expect(subject.metadata_mode).to include(:record_props)
     end
+
+    context "guards against nil header" do
+      let(:header) { double(:value => nil, :key => "k") }
+      let(:headers) { [ header ] }
+      let(:record) { double(:headers => headers, :topic => "topic", :partition => 0,
+                            :offset => 123456789, :key => "someId", :timestamp => nil ) }
+
+      it "does not raise error when key is nil" do
+        subject.register
+        evt = LogStash::Event.new('message' => 'Hello')
+        expect { subject.maybe_set_metadata(evt, record) }.not_to raise_error
+      end
+    end
   end
 
   context 'with client_rack' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-kafka
 version: !ruby/object:Gem::Version
-  version: 11.2.0
+  version: 11.3.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-14 00:00:00.000000000 Z
+date: 2023-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -257,20 +257,15 @@ files:
 - spec/unit/inputs/avro_schema_fixture_payment.asvc
 - spec/unit/inputs/kafka_spec.rb
 - spec/unit/outputs/kafka_spec.rb
-- vendor/jar-dependencies/com/github/luben/zstd-jni/1.5.2-2/zstd-jni-1.5.2-2.jar
-- vendor/jar-dependencies/io/confluent/common-config/7.3.0/common-config-7.3.0.jar
-- vendor/jar-dependencies/io/confluent/common-utils/7.3.0/common-utils-7.3.0.jar
-- vendor/jar-dependencies/io/confluent/kafka-avro-serializer/7.3.0/kafka-avro-serializer-7.3.0.jar
-- vendor/jar-dependencies/io/confluent/kafka-schema-registry-client/7.3.0/kafka-schema-registry-client-7.3.0.jar
-- vendor/jar-dependencies/io/confluent/kafka-schema-serializer/7.3.0/kafka-schema-serializer-7.3.0.jar
-- vendor/jar-dependencies/javax/ws/rs/javax.ws.rs-api/2.1.1/javax.ws.rs-api-2.1.1.jar
-- vendor/jar-dependencies/org/apache/avro/avro/1.11.0/avro-1.11.0.jar
-- vendor/jar-dependencies/org/apache/kafka/kafka-clients/3.3.1/kafka-clients-3.3.1.jar
-- vendor/jar-dependencies/org/apache/kafka/kafka_2.12/3.3.1/kafka_2.12-3.3.1.jar
-- vendor/jar-dependencies/org/glassfish/jersey/core/jersey-common/2.33/jersey-common-2.33.jar
+- vendor/jar-dependencies/com/github/luben/zstd-jni/1.5.5-4/zstd-jni-1.5.5-4.jar
+- vendor/jar-dependencies/io/confluent/kafka-avro-serializer/7.4.0/kafka-avro-serializer-7.4.0.jar
+- vendor/jar-dependencies/io/confluent/kafka-schema-registry-client/7.4.0/kafka-schema-registry-client-7.4.0.jar
+- vendor/jar-dependencies/io/confluent/kafka-schema-serializer/7.4.0/kafka-schema-serializer-7.4.0.jar
+- vendor/jar-dependencies/org/apache/avro/avro/1.11.1/avro-1.11.1.jar
+- vendor/jar-dependencies/org/apache/kafka/kafka-clients/3.4.1/kafka-clients-3.4.1.jar
 - vendor/jar-dependencies/org/lz4/lz4-java/1.8.0/lz4-java-1.8.0.jar
 - vendor/jar-dependencies/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar
-- vendor/jar-dependencies/org/xerial/snappy/snappy-java/1.1.8.4/snappy-java-1.1.8.4.jar
+- vendor/jar-dependencies/org/xerial/snappy/snappy-java/1.1.10.1/snappy-java-1.1.10.1.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache-2.0
@@ -294,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Integration with Kafka - input and output plugins