logstash-codec-fluent 3.4.0-java → 3.4.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e17d4af78cd9df1b4534f747813c106d9c1c4e3072a2f74989bfd78413e3173c
-  data.tar.gz: 4c77861536c3a5ea3c4e8eef9d97bdc0c986a42991261b9143a80bfa7ede0254
+  metadata.gz: fa2fd8d949aa00ed210e7715803b3bf20c3574a63dd6d7c4c962bb566652d756
+  data.tar.gz: b14c9124fab77dc4c808f5af0ff291e79a5fd362cefccdcae19c7e1ad488e24e
 SHA512:
-  metadata.gz: 8e876b1ee27ca9f647baff747432261a10a41d1217bc228f458d7c45641a93d70a6765eb312a1e141e05f6413a8866f4dee731bf215d7c5f8466583e7e2f7888
-  data.tar.gz: ffcfe5a551b868a02eb53ebefece63e97bd57c70f31a1b925d4a8e80093c92186fbfe1eeee061d1def481930f244b97f3061cc750a8880fb807f804c164982e1
+  metadata.gz: d6314b384f04df293ba102eeabe9a0c500b1f0258e680a6157c09d907b5d98ac6006ce808f73d8044045d5a1553309600ca4cb973dee188a766e85075be84b6c
+  data.tar.gz: b015062ffe93575ab9b176f2d06ea6cdf9bdb6cdb7408aaa79a4be5cec2ae08e57065e99f809c2ac3e8ef80cc0ac557172561a197fd9f59f001296663d1ff852

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.4.1
+  - Fix: handle multiple PackForward-encoded messages in a single payload [#28](https://github.com/logstash-plugins/logstash-codec-fluent/pull/28)
+
 ## 3.4.0
   - Feat: added target configuration + event-factory support [#27](https://github.com/logstash-plugins/logstash-codec-fluent/pull/27)
   - Fix: decoding of time's nano-second precision 

data/lib/logstash/codecs/fluent.rb

@@ -117,7 +117,7 @@ class LogStash::Codecs::Fluent < LogStash::Codecs::Base
         raise(LogStash::Error, "PackedForward with compression is not supported")
       end
 
-      entries_decoder = @decoder
+      entries_decoder = @factory.unpacker
       entries_decoder.feed_each(entries) do |entry|
         yield generate_event(entry[1], entry[0], tag)
       end

data/logstash-codec-fluent.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-fluent'
-  s.version         = '3.4.0'
+  s.version         = '3.4.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Reads the `fluentd` `msgpack` schema"
   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"

data/spec/codecs/fluent_spec.rb

@@ -13,7 +13,7 @@ describe LogStash::Codecs::Fluent do
     @unpacker = @factory.unpacker
   end
 
-  subject { LogStash::Codecs::Fluent.new(config) }
+  subject(:fluent_codec) { LogStash::Codecs::Fluent.new(config) }
 
   let(:config) { Hash.new }
 
@@ -202,6 +202,46 @@ describe LogStash::Codecs::Fluent do
 
   end
 
+  describe "event decoding (multiple PackForward messages)" do
+    def pack_events(logstash_events)
+      packer = @factory.packer
+      logstash_events.map {|logstash_event| [logstash_event.timestamp.to_i, logstash_event.to_hash.merge(LogStash::Event::TIMESTAMP => logstash_event.timestamp.to_iso8601)] }
+                     .each {|fluentd_event_tuple| packer.pack(fluentd_event_tuple) }
+      packer.to_s
+    end
+
+    def generate_event(idx)
+      LogStash::Event.new("idx" => idx)
+    end
+
+    def generate_events(idx_range)
+      idx_range.map {|idx| generate_event(idx) }
+    end
+
+    # our message needs to contain _multiple_ PackForward events, at least
+    # one of which contains multiple Events in its pack. This ensures we don't
+    # cross wires with our pack buffers.
+    let(:message) do
+      @factory.packer.pack([tag, pack_events(generate_events(000...100))])
+                     .pack([tag, pack_events(generate_events(100...117))])
+                     .pack([tag, pack_events([generate_event(117)])])
+                     .pack([tag, pack_events([generate_event(118)])])
+                     .pack([tag, pack_events(generate_events(119...199))])
+                     .to_s
+    end
+
+    it 'decodes packed events without errors' do
+      seen = []
+
+      fluent_codec.decode(message) do |event|
+        seen << event.get("idx")
+        expect(event.get("tags")).to be_a_kind_of(Array).and(include(tag))
+      end
+
+      expect(seen).to match_array((000...199).to_a) # unordered
+    end
+  end
+
   describe "event decoding (broken package)" do
 
     let(:epochtime) { timestamp.to_s }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-fluent
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-09 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -20,8 +20,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.99'
   name: logstash-core-plugin-api
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -37,8 +37,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
   name: logstash-mixin-event_support
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -51,8 +51,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
   name: logstash-mixin-validator_support
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -65,8 +65,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
   name: msgpack
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -79,8 +79,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
   name: logstash-devutils
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Reads the `fluentd` `msgpack` schema