logstash-input-beats 6.8.3-java → 6.8.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5d648febef34d9834c245aa2bf0e0df2c911dc3afc1ce3ba8fb1ee41b2117ff
-  data.tar.gz: acd87cf69f58bc303aa2b3181160d816f9302bf196caf6d84ac1206e02bb3fc1
+  metadata.gz: a26922cbcd9213f93a8729afa3ef58abedf78468f28b7bf2317ad8aa7b173539
+  data.tar.gz: b1120393ac6920fb6277b048b2e39645be0c846864433a2ee48b566e3ee7ce38
 SHA512:
-  metadata.gz: 930b79caab311cbf62bf7ed51409d2e6458f3eb162db4c3de338d14a56e06b9934312a5bffc23e941952699d5cb86036fe86b4375231913b3665636ff41d6e88
-  data.tar.gz: 6b2bd8ddc4d0127998cd1c877ea15b575144730eb788caad210b033efa45fbc402dfbad5bc41e8eb21b5ecae239fcbf46c47ecdbf93bc15bd649f2422b494697
+  metadata.gz: e1f1d39e8198af2c1867c217c962d6c8a91bcb6d9b382ba62bd5467fc50fc57cc2973d3b0612ca3dc15e3d88841ea395c303d06c658d5e36d2578c3d48c6487a
+  data.tar.gz: f25381a87fffd76b3fb1caf004336b5edb4b632d0777e25d684eac75c053289f3d8893c4ad40988a71089f43e7ed5fae40a64f36fe2af89e569e0b1262519ffc

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 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.8.4

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
@@ -167,7 +167,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.8.4')

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 6.8.3
+  version: 6.8.4
 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.8.4/logstash-input-beats-6.8.4.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)