logstash-codec-fluent 3.1.5-java → 3.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aca8f819ccd68370aca89aaa41b3181b410dad316d242a3d07e06d44e4f7808
-  data.tar.gz: 79a5070f79985cd4cbdd4b64d9d1215c8567deb7476b9816b7a8ed618d66a821
+  metadata.gz: ee03e06bd2f0fc38268db7f16e6de3405328331f63e08007feb24a91bd4cef34
+  data.tar.gz: 2413c637ab79150cc9dc6731f6cefd36969909487ac217d145d7f1298ba28250
 SHA512:
-  metadata.gz: 3a292af9e0c446a9b0f2b452a72ac26631ba54c25a5ce3ecf5e8df75b51e7e0a0ac477791118391312a987dff55caeeb8eb5d69a12f57e2be2345a91d4f8d16f
-  data.tar.gz: bab9368b368a34068c3638abbc1e6a81389f99d52112dfdd0986cf973fb94593a447e65ab9c32dd1efb301ab03d11a704585333801c4a3968c36e964010ac289
+  metadata.gz: 9932e23fdfe7efd1896fa45be2b86c630a8150ad2d823f7b6ab980ce458045db9e019580dcf33b14565d3411efea0b5b1c88d0c5e8a7fbffc7bb622f8a85b70b
+  data.tar.gz: 3ee22d094f5be07cb97310a94d9de06127377d757770d0899ae0ff11ad0f45969ac4fde29b1866e964691a24bd228c61a62b945114b0ae59819ee1ae9b17f47d

data/CHANGELOG.md

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

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012-2018 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.

data/lib/logstash/codecs/fluent.rb

@@ -40,7 +40,9 @@ class LogStash::Codecs::Fluent < LogStash::Codecs::Base
   end # def decode
 
   def encode(event)
-    tag = event.get("tags") || "log"
+    # Ensure tag to "tag1.tag2.tag3" style string.
+    # Fluentd cannot handle Array class value in forward protocol's tag.
+    tag = forwardable_tag(event)
     epochtime = event.timestamp.to_i
 
     # use normalize to make sure returned Hash is pure Ruby for
@@ -51,6 +53,18 @@ class LogStash::Codecs::Fluent < LogStash::Codecs::Base
     @on_event.call(event, MessagePack.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_event(data, &block)

data/logstash-codec-fluent.gemspec

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

@@ -43,6 +43,44 @@ describe LogStash::Codecs::Fluent do
 
   end
 
+  describe "forward protocol tag" do
+    let(:event)      { LogStash::Event.new(properties) }
+    subject { LogStash::Plugin.lookup("codec", "fluent").new }
+
+    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
+
+  end
+
   describe "event decoding (buckets of events)" do
 
     let(:tag)       { "mytag" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-fluent
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.2.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Reads the `fluentd` `msgpack` schema