logstash-input-beats 6.8.3-java → 6.9.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5d648febef34d9834c245aa2bf0e0df2c911dc3afc1ce3ba8fb1ee41b2117ff
-  data.tar.gz: acd87cf69f58bc303aa2b3181160d816f9302bf196caf6d84ac1206e02bb3fc1
+  metadata.gz: 01fefa4a08a49d5b8327676fb8e9699f4dac1a656c4af806bfd52ab8b4765525
+  data.tar.gz: 5088c69b9ee6e5af1fd1eca90bafc1666834a6fa33759d7f5ec11e55d118b095
 SHA512:
-  metadata.gz: 930b79caab311cbf62bf7ed51409d2e6458f3eb162db4c3de338d14a56e06b9934312a5bffc23e941952699d5cb86036fe86b4375231913b3665636ff41d6e88
-  data.tar.gz: 6b2bd8ddc4d0127998cd1c877ea15b575144730eb788caad210b033efa45fbc402dfbad5bc41e8eb21b5ecae239fcbf46c47ecdbf93bc15bd649f2422b494697
+  metadata.gz: 397e56a448f16eb3b0c149924b84474c494d680ebf9f5b51fbda46fc11d2cd3ab94896be435dde4e094b7b737fde9623d44feb2e922f74f50456420137d63948
+  data.tar.gz: c68a662dbb9494535b3200c2a0866da4fb2703667be266868b4214755b32e169ec1fee640a2c54b12c4b2a999f8d3b58e7126726eadbfbf66888d1d1664bec24

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 6.9.0
+  - Improvements on plugin's shutdown [#500](https://github.com/logstash-plugins/logstash-input-beats/pull/500)
+    - Fix: avoid plugin crash when connection terminated but processing the message
+    - Graceful shutdown: close acceptor group (incoming socket handler) first, ask and wait for the executors which have pending tasks, better message handling when executors terminated
+
+## 6.8.4
+  - Fixed to populate the `@metadata` fields even if the source's metadata value is `nil` [#502](https://github.com/logstash-plugins/logstash-input-beats/pull/502)
+
 ## 6.8.3
   - bump netty to 4.1.109 [#495](https://github.com/logstash-plugins/logstash-input-beats/pull/495)
 

data/VERSION

@@ -1 +1 @@
-6.8.3
+6.9.0

data/lib/logstash/inputs/beats/codec_callback_listener.rb

@@ -2,12 +2,12 @@
 require "logstash/inputs/beats"
 
 module LogStash module Inputs class Beats
-  # Use the new callback based approch instead of using blocks
+  # Use the new callback based approach instead of using blocks
   # so we can retain some context of the execution, and make it easier to test
   class CodecCallbackListener
     attr_accessor :data
     # The path acts as the `stream_identity`, 
-    # usefull when the clients is reading multiples files
+    # useful when the clients is reading multiples files
     attr_accessor :path
 
     def initialize(data, hash, path, transformer, queue)

data/lib/logstash/inputs/beats/message_listener.rb

@@ -35,7 +35,7 @@ module LogStash module Inputs class Beats
 
       if @input.include_source_metadata?
         ip_address = ip_address(ctx)
-        unless ip_address.nil? || hash['@metadata'].nil?
+        unless ip_address.nil?
           set_nested(hash, @input.field_hostip, ip_address)
         end
       end
@@ -49,11 +49,18 @@ module LogStash module Inputs class Beats
         @nocodec_transformer.transform(event)
         @queue << event
       else
-        codec(ctx).accept(CodecCallbackListener.new(target_field,
-                                                    hash,
-                                                    message.getIdentityStream(),
-                                                    @codec_transformer,
-                                                    @queue))
+        current_codec = codec(ctx)
+        if current_codec
+          current_codec.accept(CodecCallbackListener.new(target_field,
+                                                         hash,
+                                                         message.getIdentityStream(),
+                                                         @codec_transformer,
+                                                         @queue))
+        else
+          # the possible cases: connection closed or exception with a connection
+          # let client retry
+          input.logger.warn("No codec available to process the message. This may due to connection termination and message was being processed.")
+        end
       end
     end
 
@@ -167,7 +174,7 @@ module LogStash module Inputs class Beats
       field_ref = Java::OrgLogstash::FieldReference.from(field_name)
       # create @metadata sub-hash if needed
       if field_ref.type == Java::OrgLogstash::FieldReference::META_CHILD
-        nesting_hash = hash["@metadata"]
+        nesting_hash = hash['@metadata'] ||= {}
       else
         nesting_hash = hash
       end

data/lib/logstash-input-beats_jars.rb

@@ -8,4 +8,4 @@ require_jar('io.netty', 'netty-transport', '4.1.109.Final')
 require_jar('io.netty', 'netty-handler', '4.1.109.Final')
 require_jar('io.netty', 'netty-transport-native-unix-common', '4.1.109.Final')
 require_jar('org.javassist', 'javassist', '3.24.0-GA')
-require_jar('org.logstash.beats', 'logstash-input-beats', '6.8.3')
+require_jar('org.logstash.beats', 'logstash-input-beats', '6.9.0')

data/spec/inputs/beats/message_listener_spec.rb

@@ -109,6 +109,15 @@ shared_examples "when the message is from any libbeat" do |ecs_compatibility, ho
       expect(event.get(host_field_name)).to eq(nil)
     end
   end
+
+  context 'when @metadata is nil' do
+    let(:data) { super().reject { |k| '@metadata'.eql?(k) } }
+
+    it 'extracts event with the host field metadata set' do
+      subject.onNewMessage(ctx, message)
+      expect(queue.pop.get(host_field_name)).to eq(ip_address)
+    end
+  end
 end
 
 describe LogStash::Inputs::Beats::MessageListener do
@@ -209,6 +218,24 @@ describe LogStash::Inputs::Beats::MessageListener do
       end
     end
 
+    context "when connection is terminated" do
+      let(:message) { MockMessage.new("message from Mars", { "message" => "hello world", "@metadata" => {} } )}
+
+      it "handles without crashing" do
+        subject.onConnectionClose(ctx)
+        expect(subject.connections_list[ctx]).to be nil
+
+        expect( input.logger ).to receive(:warn) do |message |
+          expect( message ).to match /No codec available to process the message. This may due to connection termination and message was being processed./
+        end
+
+        subject.onNewMessage(ctx, message)
+        # doesn't push to queue, so should be nil
+        event = queue.pop
+        expect(event.get("message")).to be nil
+      end
+    end
+
     it_behaves_like "when the message is from any libbeat", :disabled, "[@metadata][ip_address]"
     it_behaves_like "when the message is from any libbeat", :v1, "[@metadata][input][beats][host][ip]"
     it_behaves_like "when the message is from any libbeat", :v8, "[@metadata][input][beats][host][ip]"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 6.8.3
+  version: 6.9.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-23 00:00:00.000000000 Z
+date: 2024-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -326,7 +326,7 @@ files:
 - vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/4.1.109.Final/netty-transport-native-unix-common-4.1.109.Final.jar
 - vendor/jar-dependencies/io/netty/netty-transport/4.1.109.Final/netty-transport-4.1.109.Final.jar
 - vendor/jar-dependencies/org/javassist/javassist/3.24.0-GA/javassist-3.24.0-GA.jar
-- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.8.3/logstash-input-beats-6.8.3.jar
+- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.9.0/logstash-input-beats-6.9.0.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)