fluent-plugin-cloudwatch-logs 0.8.1.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a54897a6cb82b6180e4f3a627b3cb89859992553d5d18d2d48deb80a8820d3c
-  data.tar.gz: f16ac2df79648c3b919132811dfcdb3a82b3ea9776256adcad7f705cbb5e2249
+  metadata.gz: aa86963bdf4ec3faf83caed90ad1ab437ea2991d97e793d50a2e507e9ff0c1af
+  data.tar.gz: 4add147b77a03c2296469b21b188882a105d7736f5a576a6331aac9d266e4e34
 SHA512:
-  metadata.gz: e24910ad7f2120bac140d26080c05e851fc7388a683e07ac308282d8dc7c6d31afb19b2744d9b2628bbe7b9f2c784da83a7c8b60f908478626fc2cd16ea0eb9f
-  data.tar.gz: dc81615457af3fcf5ff8347fab186c2ea9cec90af31de3ac2bc5c13ff51ea4d234acd07f162d5e1fa36d5c8a8d1079ed82b67cb2344cb084914d1b4c63c07b55
+  metadata.gz: 7372c750e2947bf4b872b1f3f53c19494ed136274d0b9443f21ae32c8595e9d30968aae30a82a375a48ce6e7d0ce6429106b4ebe2c68bcdace4fd7801bc1648d
+  data.tar.gz: 1bc6416f7dc38a2479e01a4847bf4241e0c29cbd7ac531e05faa9d4da2cec2cc7cc428b76f2a726c9fda173e4d6d2c51a24cb03b70b0db05fc032e12088c7245

data/lib/fluent/plugin/cloudwatch/logs/version.rb

@@ -2,7 +2,7 @@ module Fluent
   module Plugin
     module Cloudwatch
       module Logs
-        VERSION = "0.8.1.1"
+        VERSION = "0.8.2"
       end
     end
   end

data/lib/fluent/plugin/out_cloudwatch_logs.rb

@@ -219,15 +219,22 @@ module Fluent::Plugin
 
         events = []
         rs.each do |t, time, record|
+          record = drop_empty_record(record)
+
           time_ms = (time.to_f * 1000).floor
 
           scrub_record!(record)
           unless @message_keys.empty?
-            message = @message_keys.map {|k| record[k].to_s }.join(' ')
+            message = @message_keys.map{|k| record[k].to_s }.reject{|e| e.empty? }.join(' ')
           else
             message = @json_handler.dump(record)
           end
 
+          if message.empty?
+            log.warn "Within specified message_key(s): (#{@message_keys.join(',')}) do not have non-empty record. Skip."
+            next
+          end
+
           if @max_message_length
             message = message.slice(0, @max_message_length)
           end
@@ -256,6 +263,17 @@ module Fluent::Plugin
     end
 
     private
+
+    def drop_empty_record(record)
+      new_record = record.dup
+      new_record.each_key do |k|
+        if new_record[k] == ""
+          new_record.delete(k)
+        end
+      end
+      new_record
+    end
+
     def scrub_record!(record)
       case record
       when Hash

data/test/plugin/test_out_cloudwatch_logs.rb

@@ -714,6 +714,36 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
       logs = d.logs
       assert(logs.any?{|log| log =~ /Log event in .* discarded because it is too large: 262184 bytes exceeds limit of 262144/})
     end
+
+    def test_do_not_emit_empty_record
+      new_log_stream
+
+      d = create_driver(<<-EOC)
+        #{default_config}
+        message_keys cloudwatch,message
+        log_group_name #{log_group_name}
+        log_stream_name #{log_stream_name}
+      EOC
+
+      time = event_time
+      d.run(default_tag: fluentd_tag) do
+        d.feed(time, {'cloudwatch' => 'logs1', 'message' => ''})
+        d.feed(time + 1, {'cloudwatch' => '', 'message' => 'message2'})
+        d.feed(time + 2, {'cloudwatch' => '', 'message' => ''})
+      end
+
+      sleep 10
+
+      events = get_log_events
+      assert_equal(2, events.size)
+      assert_equal((time.to_f * 1000).floor, events[0].timestamp)
+      assert_equal('logs1', events[0].message)
+      assert_equal((time.to_i + 1) * 1000, events[1].timestamp)
+      assert_equal('message2', events[1].message)
+
+      logs = d.logs
+      assert(logs.any?{|log| log =~ /Within specified message_key\(s\): \(cloudwatch,message\) do not have non-empty record. Skip./})
+    end
   end
 
   def test_scrub_record

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch-logs
 version: !ruby/object:Gem::Version
-  version: 0.8.1.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd