logstash-codec-fluent 3.1.4-java → 3.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cd782702ef7a4c794d07da5e4126fc36ce50b1ec
-  data.tar.gz: 53592fa01729af32a45eb635b64ab13c249cf1fb
+SHA256:
+  metadata.gz: e17d4af78cd9df1b4534f747813c106d9c1c4e3072a2f74989bfd78413e3173c
+  data.tar.gz: 4c77861536c3a5ea3c4e8eef9d97bdc0c986a42991261b9143a80bfa7ede0254
 SHA512:
-  metadata.gz: 5fdf8856b874689a66081ef9dff8d85a56cabcaef984544600141a220c8c27dad2e772e5a9cca65e226ff2f8cb90d9c850ca1441d4fa03d26bdd896b178c2c11
-  data.tar.gz: 8ed8089bc2671a215746531a5f31aaadb3d67a3c190f4c414538e73ddc935352e7b456025c84e41a531a6209878c2027bd06543cd6550323bd3cb7c4cd0be328
+  metadata.gz: 8e876b1ee27ca9f647baff747432261a10a41d1217bc228f458d7c45641a93d70a6765eb312a1e141e05f6413a8866f4dee731bf215d7c5f8466583e7e2f7888
+  data.tar.gz: ffcfe5a551b868a02eb53ebefece63e97bd57c70f31a1b925d4a8e80093c92186fbfe1eeee061d1def481930f244b97f3061cc750a8880fb807f804c164982e1

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 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 
+
+## 3.3.0
+  - Handle EventTime msgpack extension to handle nanosecond precision time and add its parameter [#18](https://github.com/logstash-plugins/logstash-codec-fluent/pull/18)
+
+## 3.2.0
+  - Encode tags as fluent forward protocol tags. Ref: https://github.com/logstash-plugins/logstash-codec-fluent/pull/21
+
+## 3.1.5
+  - Update gemspec summary
+
 ## 3.1.4
   - Constrain msgpack dependency to ~> 1.1 due to old versions not containing some format and type definitions
 ## 3.1.3

data/LICENSE

@@ -1,13 +1,202 @@
-Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-    http://www.apache.org/licenses/LICENSE-2.0
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2020 Elastic and contributors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -1,6 +1,6 @@
 # Logstash Plugin
 
-[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-codec-fluent.svg)](https://travis-ci.org/logstash-plugins/logstash-codec-fluent)
+[![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-codec-fluent.svg)](https://travis-ci.com/logstash-plugins/logstash-codec-fluent)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 

data/docs/index.asciidoc

@@ -36,8 +36,48 @@ And from your ruby code in your own application:
     logger = Fluent::Logger::FluentLogger.new(nil, :host => "example.log", :port => 4000)
     logger.post("some_tag", { "your" => "data", "here" => "yay!" })
 
-Notes:
 
-* the fluent uses a second-precision time for events, so you will never see
-  subsecond precision on events processed by this codec.
+NOTE: Fluent uses second-precision for events, so you will not see sub-second precision
+on events processed by this codec.
+
+
+[id="plugins-{type}s-{plugin}-options"]
+==== Fluent Codec configuration options
+
+[cols="<,<,<",options="header",]
+|=======================================================================
+|Setting |Input type|Required
+| <<plugins-{type}s-{plugin}-nanosecond_precision>> |<<boolean,boolean>>|No
+| <<plugins-{type}s-{plugin}-target>> |<<string,string>>|No
+|=======================================================================
+
+&nbsp;
+
+[id="plugins-{type}s-{plugin}-nanosecond_precision"]
+===== `nanosecond_precision`
+
+  * Value type is <<boolean,boolean>>
+  * Default value is `false`
+
+Enables sub-second level precision while encoding events.
+
+[id="plugins-{type}s-{plugin}-target"]
+===== `target`
+
+  * Value type is <<string,string>>
+  * There is no default value for this setting.
+
+Define the target field for placing the decoded values. If this setting is not
+set, data will be stored at the root (top level) of the event.
+
+For example, if you want data to be put under the `logs` field:
+[source,ruby]
+    input {
+      tcp {
+        codec => fluent {
+          target => "[logs]"
+        }
+        port => 4000
+      }
+    }
 

data/lib/logstash/codecs/fluent.rb

@@ -1,16 +1,21 @@
 # encoding: utf-8
 require "logstash/codecs/base"
-require "logstash/util/charset"
+require "logstash/event"
 require "logstash/timestamp"
 require "logstash/util"
 
+require 'logstash/plugin_mixins/event_support/event_factory_adapter'
+require 'logstash/plugin_mixins/validator_support/field_reference_validation_adapter'
+
 # This codec handles fluentd's msgpack schema.
 #
 # For example, you can receive logs from `fluent-logger-ruby` with:
 # [source,ruby]
 #     input {
 #       tcp {
-#         codec => fluent
+#         codec => fluent {
+#           nanosecond_precision => true
+#         }
 #         port => 4000
 #       }
 #     }
@@ -22,15 +27,33 @@ require "logstash/util"
 #
 # Notes:
 #
-# * the fluent uses a second-precision time for events, so you will never see
-#   subsecond precision on events processed by this codec.
+# * to handle EventTime msgpack extension, you must specify nanosecond_precision parameter as true.
 #
 class LogStash::Codecs::Fluent < LogStash::Codecs::Base
+  require "logstash/codecs/fluent/event_time"
+
+  extend LogStash::PluginMixins::ValidatorSupport::FieldReferenceValidationAdapter
+
+  include LogStash::PluginMixins::EventSupport::EventFactoryAdapter
+
   config_name "fluent"
 
+  config :nanosecond_precision, :validate => :boolean, :default => false
+
+  # Defines a target field for placing decoded fields.
+  # If this setting is omitted, data gets stored at the root (top level) of the event.
+  #
+  # NOTE: the target is only relevant while decoding data into a new event.
+  config :target, :validate => :field_reference
+
   def register
     require "msgpack"
-    @decoder = MessagePack::Unpacker.new
+    @factory = MessagePack::Factory.new
+    if @nanosecond_precision
+      @factory.register_type(EventTime::TYPE, EventTime)
+    end
+    @packer = @factory.packer
+    @decoder = @factory.unpacker
   end
 
   def decode(data, &block)
@@ -40,19 +63,47 @@ class LogStash::Codecs::Fluent < LogStash::Codecs::Base
   end # def decode
 
   def encode(event)
-    tag = event.get("tags") || "log"
-    epochtime = event.timestamp.to_i
+    # Ensure tag to "tag1.tag2.tag3" style string.
+    # Fluentd cannot handle Array class value in forward protocol's tag.
+    tag = forwardable_tag(event)
+    epochtime = if @nanosecond_precision
+                  EventTime.new(event.timestamp.to_i, event.timestamp.usec * 1000)
+                else
+                  event.timestamp.to_i
+                end
 
     # 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
-    @on_event.call(event, MessagePack.pack([tag, epochtime, data.merge(LogStash::Event::TIMESTAMP => event.timestamp.to_iso8601)]))
+    @packer.clear
+    @on_event.call(event, @packer.pack([tag, epochtime, data.merge(LogStash::Event::TIMESTAMP => event.timestamp.to_iso8601)]))
   end # def encode
 
+  def forwardable_tag(event)
+    tag = event.get("tags") || "log"
+    case tag
+    when Array
+      tag.join('.')
+    when String
+      tag
+    else
+      tag.to_s
+    end
+  end
+
   private
 
+  def decode_fluent_time(fluent_time)
+    case fluent_time
+    when Integer
+      fluent_time
+    when EventTime
+      Time.at(fluent_time.sec, fluent_time.nsec / 1000.0)
+    end
+  end
+
   def decode_event(data, &block)
     tag = data[0]
     entries = data[1]
@@ -66,42 +117,32 @@ class LogStash::Codecs::Fluent < LogStash::Codecs::Base
         raise(LogStash::Error, "PackedForward with compression is not supported")
       end
 
-      entries_decoder = MessagePack::Unpacker.new
+      entries_decoder = @decoder
       entries_decoder.feed_each(entries) do |entry|
-        epochtime = entry[0]
-        map = entry[1]
-        event = LogStash::Event.new(map.merge(
-                                      LogStash::Event::TIMESTAMP => LogStash::Timestamp.at(epochtime),
-                                      "tags" => [ tag ]
-                                    ))
-        yield event
+        yield generate_event(entry[1], entry[0], tag)
       end
     when Array
       # Forward
       entries.each do |entry|
-        epochtime = entry[0]
-        map = entry[1]
-        event = LogStash::Event.new(map.merge(
-                                      LogStash::Event::TIMESTAMP => LogStash::Timestamp.at(epochtime),
-                                      "tags" => [ tag ]
-                                    ))
-        yield event
+        yield generate_event(entry[1], entry[0], tag)
       end
-    when Fixnum
+    when Integer, EventTime
       # Message
-      epochtime = entries
-      map = data[2]
-      event = LogStash::Event.new(map.merge(
-                                    LogStash::Event::TIMESTAMP => LogStash::Timestamp.at(epochtime),
-                                    "tags" => [ tag ]
-                                  ))
-      yield event
+      yield generate_event(data[2], entries, tag)
     else
       raise(LogStash::Error, "Unknown event type")
     end
   rescue StandardError => e
     @logger.error("Fluent parse error, original data now in message field", :error => e, :data => data)
-    yield LogStash::Event.new("message" => data, "tags" => [ "_fluentparsefailure" ])
+    yield event_factory.new_event("message" => data, "tags" => [ "_fluentparsefailure" ])
+  end
+
+  def generate_event(map, fluent_time, tag)
+    epoch_time = decode_fluent_time(fluent_time)
+    event = targeted_event_factory.new_event(map)
+    event.set(LogStash::Event::TIMESTAMP, LogStash::Timestamp.at(epoch_time))
+    event.tag(tag)
+    event
   end
 
 end # class LogStash::Codecs::Fluent

data/lib/logstash/codecs/fluent/event_time.rb

@@ -0,0 +1,28 @@
+module LogStash; module Codecs; class Fluent;
+  class EventTime
+    attr_reader :sec, :nsec
+
+    TYPE = 0
+
+    def initialize(sec, nsec = 0)
+      @sec = sec
+      @nsec = nsec
+    end
+
+    def to_msgpack(io = nil)
+      @sec.to_msgpack(io)
+    end
+
+    def to_msgpack_ext
+      [@sec, @nsec].pack('NN')
+    end
+
+    def self.from_msgpack_ext(data)
+      new(*data.unpack('NN'))
+    end
+
+    def to_json(*args)
+      @sec
+    end
+  end
+end; end; end

data/logstash-codec-fluent.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-fluent'
-  s.version         = '3.1.4'
+  s.version         = '3.4.0'
   s.licenses        = ['Apache License (2.0)']
-  s.summary         = "This codec handles fluentd's msgpack schema."
+  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"
   s.authors         = ["Elastic"]
   s.email           = 'info@elastic.co'
@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
+  s.add_runtime_dependency 'logstash-mixin-event_support', '~> 1.0'
+  s.add_runtime_dependency 'logstash-mixin-validator_support', '~> 1.0'
 
   s.platform = 'java'
   

data/spec/codecs/fluent_spec.rb

@@ -2,11 +2,31 @@
 require_relative "../spec_helper"
 require "logstash/plugin"
 require "logstash/event"
+require "msgpack"
 
 describe LogStash::Codecs::Fluent do
+  before do
+    @factory = MessagePack::Factory.new
+    @factory.register_type(LogStash::Codecs::Fluent::EventTime::TYPE,
+                           LogStash::Codecs::Fluent::EventTime)
+    @packer = @factory.packer
+    @unpacker = @factory.unpacker
+  end
+
+  subject { LogStash::Codecs::Fluent.new(config) }
+
+  let(:config) { Hash.new }
 
   let(:properties) { {:name => "foo" } }
   let(:event)      { LogStash::Event.new(properties) }
+  let(:timestamp)  { event.timestamp }
+  let(:epochtime)  { timestamp.to_i }
+  let(:tag)  { "mytag" }
+  let(:data) { { 'name' => 'foo', 'number' => 42 } }
+
+  let(:message) do
+    @packer.pack([tag, epochtime, data])
+  end
 
   it "should register without errors" do
     plugin = LogStash::Plugin.lookup("codec", "fluent").new
@@ -17,9 +37,26 @@ describe LogStash::Codecs::Fluent do
 
     it "should encode as message pack format" do
       subject.on_event do |event, data|
-        fields = MessagePack.unpack(data)
-        expect(fields[0]).to eq("log")
-        expect(fields[2]["name"]).to eq("foo")
+        @unpacker.feed_each(data) do |fields|
+          expect(fields[0]).to eq("log")
+          expect(fields[2]["name"]).to eq("foo")
+        end
+      end
+      subject.encode(event)
+    end
+
+  end
+
+  describe "event encoding with EventTime" do
+
+    let(:config) { super().merge "nanosecond_precision" => true }
+
+    it "should encode as message pack format" 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")
+        end
       end
       subject.encode(event)
     end
@@ -28,16 +65,112 @@ describe LogStash::Codecs::Fluent do
 
   describe "event decoding" do
 
-    let(:tag)       { "mytag" }
-    let(:epochtime) { event.timestamp.to_i }
-    let(:data)      { LogStash::Util.normalize(event.to_hash) }
     let(:message) do
-      MessagePack.pack([tag, epochtime, data.merge(LogStash::Event::TIMESTAMP => event.timestamp.to_iso8601)])
+      @packer.pack([tag, epochtime, data.merge(LogStash::Event::TIMESTAMP => timestamp.to_iso8601)])
     end
 
     it "should decode without errors" do
+      decoded = false
       subject.decode(message) do |event|
         expect(event.get("name")).to eq("foo")
+        decoded = true
+      end
+      expect(decoded).to be true
+    end
+
+    it "should tag event" do
+      subject.decode(message) do |event|
+        expect(event.get("tags")).to eql [ tag ]
+      end
+    end
+
+  end
+
+  describe "event decoding with EventTime" do
+
+    let(:epochtime) { LogStash::Codecs::Fluent::EventTime.new(timestamp.to_i, (timestamp.usec * 1000) + 123) }
+
+    subject { LogStash::Plugin.lookup("codec", "fluent").new({"nanosecond_precision" => true}) }
+
+    it "should decode without errors" do
+      decoded = false
+      subject.decode(message) do |event|
+        expect(event.get("name")).to eq("foo")
+        decoded = true
+      end
+      expect(decoded).to be true
+    end
+
+    it "decodes timestamp with nanos" do
+      subject.decode(message) do |event|
+        expect(event.timestamp.to_i).to eql epochtime.sec
+        expect(event.timestamp.usec * 1000 + 123).to eql epochtime.nsec
+      end
+    end
+
+  end
+
+  describe "event decoding with target" do
+
+    let(:tag)       { "a_tag" }
+    let(:epochtime) { 123 }
+    let(:data)      { LogStash::Util.normalize('name' => 'foo') }
+
+    let(:config) { super().merge "target" => '[bar]' }
+
+    it "should decode without errors" do
+      decoded = false
+      subject.decode(message) do |event|
+        expect(event.include?("name")).to be false
+        expect(event.get("bar")).to eql('name' => "foo")
+        decoded = true
+      end
+      expect(decoded).to be true
+    end
+
+    it "should tag event" do
+      subject.decode(message) do |event|
+        expect(event.get("tags")).to eql [ 'a_tag' ]
+      end
+    end
+
+    it "should set timestamp" do
+      subject.decode(message) do |event|
+        expect(event.timestamp.to_i).to eql(epochtime)
+      end
+    end
+
+  end
+
+  describe "forward protocol tag" do
+
+    describe "when passing Array value" do
+      let(:properties) { {:tags => ["test", "logstash"], :name => "foo" } }
+
+      it "should be joined with '.'" do
+        subject.forwardable_tag(event) do |tag|
+          expect(tag).to eq("test.logstash")
+        end
+      end
+    end
+
+    describe "when passing String value" do
+      let(:properties) { {:tags => "test.logstash", :name => "foo" } }
+
+      it "should be pass-through" do
+        subject.forwardable_tag(event) do |tag|
+          expect(tag).to eq("test.logstash")
+        end
+      end
+    end
+
+    describe "when passing other value" do
+      let(:properties) { {:tags => :symbol, :name => "foo" } }
+
+      it "should be called to_s" do
+        subject.forwardable_tag(event) do |tag|
+          expect(tag).to eq("symbol")
+        end
       end
     end
 
@@ -45,17 +178,15 @@ describe LogStash::Codecs::Fluent do
 
   describe "event decoding (buckets of events)" do
 
-    let(:tag)       { "mytag" }
-    let(:epochtime) { event.timestamp.to_i }
-    let(:data)      { LogStash::Util.normalize(event.to_hash) }
+    let(:data) { LogStash::Util.normalize(event.to_hash) }
     let(:message) do
-      MessagePack.pack([tag,
-                        [
-                          [epochtime, data.merge(LogStash::Event::TIMESTAMP => event.timestamp.to_iso8601)],
-                          [epochtime, data.merge(LogStash::Event::TIMESTAMP => event.timestamp.to_iso8601)],
-                          [epochtime, data.merge(LogStash::Event::TIMESTAMP => event.timestamp.to_iso8601)]
-                        ]
-                       ])
+      @packer.pack([tag,
+                    [
+                      [epochtime, data.merge(LogStash::Event::TIMESTAMP => timestamp.to_iso8601)],
+                      [epochtime, data.merge(LogStash::Event::TIMESTAMP => timestamp.to_iso8601)],
+                      [epochtime, data.merge(LogStash::Event::TIMESTAMP => timestamp.to_iso8601)]
+                    ]
+                   ])
     end
 
     it "should decode without errors" do
@@ -73,14 +204,7 @@ describe LogStash::Codecs::Fluent do
 
   describe "event decoding (broken package)" do
 
-    let(:tag)       { "mytag" }
-    let(:epochtime) { event.timestamp.to_s }
-    let(:data)      { LogStash::Util.normalize(event.to_hash) }
-    let(:message) do
-      MessagePack.pack([tag,
-                        epochtime, data.merge(LogStash::Event::TIMESTAMP => event.timestamp.to_iso8601)
-                       ])
-    end
+    let(:epochtime) { timestamp.to_s }
 
     it "should decode with errors" do
       subject.decode(message) do |event|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-fluent
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.4.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2021-08-09 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:
     - - ">="
@@ -30,6 +30,34 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '2.99'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  name: logstash-mixin-event_support
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  name: logstash-mixin-validator_support
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -37,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:
     - - "~>"
@@ -51,14 +79,16 @@ 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:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-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
+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
 email: info@elastic.co
 executables: []
 extensions: []
@@ -72,6 +102,7 @@ files:
 - README.md
 - docs/index.asciidoc
 - lib/logstash/codecs/fluent.rb
+- lib/logstash/codecs/fluent/event_time.rb
 - logstash-codec-fluent.gemspec
 - spec/codecs/fluent_spec.rb
 - spec/spec_helper.rb
@@ -96,11 +127,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
-summary: This codec handles fluentd's msgpack schema.
+summary: Reads the `fluentd` `msgpack` schema
 test_files:
 - spec/codecs/fluent_spec.rb
 - spec/spec_helper.rb