logstash-codec-fluent 3.4.1-java → 3.4.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa2fd8d949aa00ed210e7715803b3bf20c3574a63dd6d7c4c962bb566652d756
-  data.tar.gz: b14c9124fab77dc4c808f5af0ff291e79a5fd362cefccdcae19c7e1ad488e24e
+  metadata.gz: 5cda92410b315daf405815fab12044bf29951b972f4173b8976854375a63e322
+  data.tar.gz: 3b3dc8fe1d69d82a10306ca4bb8c35b6ee613a6d4c19d670c5d839dc6609cdd6
 SHA512:
-  metadata.gz: d6314b384f04df293ba102eeabe9a0c500b1f0258e680a6157c09d907b5d98ac6006ce808f73d8044045d5a1553309600ca4cb973dee188a766e85075be84b6c
-  data.tar.gz: b015062ffe93575ab9b176f2d06ea6cdf9bdb6cdb7408aaa79a4be5cec2ae08e57065e99f809c2ac3e8ef80cc0ac557172561a197fd9f59f001296663d1ff852
+  metadata.gz: 1af628264fba7316ef61c68ff0b0ff6ddf6136c2613f4720a80d1e2c43d772d86c281a9dae49a508c135834b14aa9654673f488d856d82c93ef72e2ed717a970
+  data.tar.gz: e8126519435802ec52cc3f39142621d7cff4c01993f7214639c9cc4bcd07c9565244db38e705a204fb7fd747fa14597a400847ceecceb9928c78a79346fb176d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.4.3
+  - Fix: reduce overhead of unpacking packforward-payloads by reusing a single instance [#32](https://github.com/logstash-plugins/logstash-codec-fluent/pull/32)
+
+## 3.4.2
+  - Fix: Convert LogStash::Timestamp values to iso-8601 to resolve crash issue with `msgpack` serialization [#30](https://github.com/logstash-plugins/logstash-codec-fluent/pull/30)
+
 ## 3.4.1
   - Fix: handle multiple PackForward-encoded messages in a single payload [#28](https://github.com/logstash-plugins/logstash-codec-fluent/pull/28)
 

data/lib/logstash/codecs/fluent.rb

@@ -54,6 +54,7 @@ class LogStash::Codecs::Fluent < LogStash::Codecs::Base
     end
     @packer = @factory.packer
     @decoder = @factory.unpacker
+    @packforward_decoder = nil
   end
 
   def decode(data, &block)
@@ -75,10 +76,9 @@ class LogStash::Codecs::Fluent < LogStash::Codecs::Base
     # use normalize to make sure returned Hash is pure Ruby for
     # MessagePack#pack which relies on pure Ruby object recognition
     data = LogStash::Util.normalize(event.to_hash)
-    # timestamp is serialized as a iso8601 string
-    # merge to avoid modifying data which could have side effects if multiple outputs
+
     @packer.clear
-    @on_event.call(event, @packer.pack([tag, epochtime, data.merge(LogStash::Event::TIMESTAMP => event.timestamp.to_iso8601)]))
+    @on_event.call(event, @packer.pack([tag, epochtime, normalize_timestamps(data)]))
   end # def encode
 
   def forwardable_tag(event)
@@ -117,7 +117,7 @@ class LogStash::Codecs::Fluent < LogStash::Codecs::Base
         raise(LogStash::Error, "PackedForward with compression is not supported")
       end
 
-      entries_decoder = @factory.unpacker
+      entries_decoder = (@packforward_decoder ||= @factory.unpacker).tap(&:reset)
       entries_decoder.feed_each(entries) do |entry|
         yield generate_event(entry[1], entry[0], tag)
       end
@@ -145,4 +145,20 @@ class LogStash::Codecs::Fluent < LogStash::Codecs::Base
     event
   end
 
+  ## Serializes timestamp as a iso8601 string, otherwise fluentd complains when packing the data
+  # @param object any type of data such as Hash, Array, etc...
+  # @return same shape of input with iso8061 serialized timestamps
+  def normalize_timestamps(object)
+    case object
+    when Hash
+      object.inject({}){|result, (key, value)| result[key] = normalize_timestamps(value); result}
+    when Array
+      object.map{|element| normalize_timestamps(element)}
+    when LogStash::Timestamp
+      object.to_iso8601
+    else
+      object
+    end
+  end
+
 end # class LogStash::Codecs::Fluent

data/logstash-codec-fluent.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-fluent'
-  s.version         = '3.4.1'
+  s.version         = '3.4.3'
   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

@@ -47,6 +47,28 @@ describe LogStash::Codecs::Fluent do
 
   end
 
+  describe "when encoding timestamps" do
+    let(:properties) { {:name => "foo", :custom_time => Time.now(), :time => { :custom_time => Time.now() }, :custom_times => [Time.now(), Time.now(), "2023-03-28"] } }
+
+    it "converts to iso8601 and encodes without issue" do
+      subject.on_event do |event, data|
+        @unpacker.feed_each(data) do |fields|
+          expect(fields[0]).to eq("log")
+          expect(fields[2]["name"]).to eq("foo")
+          expect(fields[2]["custom_time"]).not_to be_nil
+          expect(fields[2]["custom_time"].class).to eql(String) # iso8601 string
+          expect(fields[2]["time"]).not_to be_nil
+          expect(fields[2]["time"]["custom_time"]).not_to be_nil
+          expect(fields[2]["time"]["custom_time"].class).to eql(String)
+          expect(fields[2]["custom_times"]).not_to be_nil
+          expect(fields[2]["custom_times"][0].class).to eql(String)
+          expect(fields[2]["custom_times"][2]).to eql("2023-03-28")
+        end
+      end
+      subject.encode(event)
+    end
+  end
+
   describe "event encoding with EventTime" do
 
     let(:config) { super().merge "nanosecond_precision" => true }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-fluent
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.3
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2024-06-25 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
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -37,8 +37,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
   name: logstash-mixin-event_support
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -51,8 +51,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
   name: logstash-mixin-validator_support
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -65,8 +65,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
   name: msgpack
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -79,8 +79,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
   name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   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.1.6
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Reads the `fluentd` `msgpack` schema