fluent-plugin-kubernetes_metadata_filter 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6b445ba2f0982bd35de2efb14c3c63018929a88
-  data.tar.gz: ca6ca38cc0dc1c02617b5656249b81ea3079c463
+  metadata.gz: '0971b8dc580d4813a1859834d5fc5ba334eb3633'
+  data.tar.gz: 3a054314a366671caf9307a81dd9e38ea6aa7dd5
 SHA512:
-  metadata.gz: 9a6494885196744461c705ee8216ce6dc2471a30819c9346ee4661860b613ca3795e079aa3b80b6a00ebea3fc184bf8eedacfca60d11d24ea5be3a24ccd7a5ab
-  data.tar.gz: da5ed5376cc30f925cbef088aeb8c1aea78cd687964b12b399df835f11de2fb495daac661b69a077343612e544163a51f6fd9674430fe2b9c6dc1a62a724ef5c
+  metadata.gz: 6852eb69fd3f256a6a2825daf6cbe3a58bb8aa646dd054c7d99c65ca9928d2fc4adc87791fbb31f4326e213cc2b1f58957a49da1bfa2c58c0d3864e2883e8d28
+  data.tar.gz: e640578dd09913bdc9879508970a3528386e6e2fffc6c63acc3aa21358ab8e8d3444f8f6c39b91172f2945a87350612c1225c19976ed574e2edb170962a00662

data/fluent-plugin-kubernetes_metadata_filter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-kubernetes_metadata_filter"
-  gem.version       = "1.1.0"
+  gem.version       = "1.2.0"
   gem.authors       = ["Jimmi Dyson"]
   gem.email         = ["jimmidyson@gmail.com"]
   gem.description   = %q{Filter plugin to add Kubernetes metadata}

data/lib/fluent/plugin/filter_kubernetes_metadata.rb

@@ -282,7 +282,7 @@ module Fluent
     end
 
     def filter_stream_from_files(tag, es)
-      return es if es.empty?
+      return es if (es.respond_to?(:empty?) && es.empty?) || !es.is_a?(Fluent::EventStream)
       new_es = MultiEventStream.new
 
       match_data = tag.match(@tag_to_kubernetes_name_regexp_compiled)
@@ -306,6 +306,7 @@ module Fluent
     end
 
     def filter_stream_from_journal(tag, es)
+      return es if (es.respond_to?(:empty?) && es.empty?) || !es.is_a?(Fluent::EventStream)
       new_es = MultiEventStream.new
       batch_miss_cache = {}
       es.each do |time, record|

data/test/plugin/test_filter_kubernetes_metadata.rb

@@ -153,6 +153,44 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
       }.filtered
     end
 
+    test 'nil event stream from journal' do
+     #not certain how this is possible but adding test to properly
+     #guard against this condition we have seen - test for nil,
+     #empty, no empty method, not an event stream
+     plugin = create_driver.instance
+     [nil, Fluent::MultiEventStream.new, 1, [1]].each do |es|
+       assert_equal es, plugin.filter_stream_from_journal('tag', es)
+     end
+     # and make sure OneEventStream works
+     ts = Time.now()
+     rec = {"message"=>"hello"}
+     es = Fluent::OneEventStream.new(ts, rec)
+     newes = plugin.filter_stream_from_journal('tag', es)
+     newes.each do |newts, newrec|
+      assert_equal ts, newts
+      assert_equal rec, newrec
+     end
+    end
+
+    test 'nil event stream from files' do
+     #not certain how this is possible but adding test to properly
+     #guard against this condition we have seen
+
+     plugin = create_driver.instance
+     [nil, Fluent::MultiEventStream.new, 1, [1]].each do |es|
+       assert_equal es, plugin.filter_stream_from_files('tag', es)
+     end
+     # and make sure OneEventStream works
+     ts = Time.now()
+     rec = {"message"=>"hello"}
+     es = Fluent::OneEventStream.new(ts, rec)
+     newes = plugin.filter_stream_from_journal('tag', es)
+     newes.each do |newts, newrec|
+      assert_equal ts, newts
+      assert_equal rec, newrec
+     end
+    end
+
     test 'inability to connect to the api server handles exception and doensnt block pipeline' do
       VCR.use_cassette('kubernetes_docker_metadata') do
         driver = create_driver('

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd