logstash-input-beats 6.8.4-java → 6.9.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a26922cbcd9213f93a8729afa3ef58abedf78468f28b7bf2317ad8aa7b173539
-  data.tar.gz: b1120393ac6920fb6277b048b2e39645be0c846864433a2ee48b566e3ee7ce38
+  metadata.gz: 01fefa4a08a49d5b8327676fb8e9699f4dac1a656c4af806bfd52ab8b4765525
+  data.tar.gz: 5088c69b9ee6e5af1fd1eca90bafc1666834a6fa33759d7f5ec11e55d118b095
 SHA512:
-  metadata.gz: e1f1d39e8198af2c1867c217c962d6c8a91bcb6d9b382ba62bd5467fc50fc57cc2973d3b0612ca3dc15e3d88841ea395c303d06c658d5e36d2578c3d48c6487a
-  data.tar.gz: f25381a87fffd76b3fb1caf004336b5edb4b632d0777e25d684eac75c053289f3d8893c4ad40988a71089f43e7ed5fae40a64f36fe2af89e569e0b1262519ffc
+  metadata.gz: 397e56a448f16eb3b0c149924b84474c494d680ebf9f5b51fbda46fc11d2cd3ab94896be435dde4e094b7b737fde9623d44feb2e922f74f50456420137d63948
+  data.tar.gz: c68a662dbb9494535b3200c2a0866da4fb2703667be266868b4214755b32e169ec1fee640a2c54b12c4b2a999f8d3b58e7126726eadbfbf66888d1d1664bec24

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 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)
 

data/VERSION

@@ -1 +1 @@
-6.8.4
+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

@@ -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
 

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.4')
+require_jar('org.logstash.beats', 'logstash-input-beats', '6.9.0')

data/spec/inputs/beats/message_listener_spec.rb

@@ -218,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 6.8.4
+  version: 6.9.0
 platform: java
 authors:
 - Elastic
@@ -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.4/logstash-input-beats-6.8.4.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)