fluent-plugin-cloudwatch-logs 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4238d9fd741cabef203f35c414b70d13955314f
-  data.tar.gz: d8f44326e2452d24b3f33c0cf2950a09187ec664
+  metadata.gz: 0be185ba203d55277c9024589f74259047cd13e3
+  data.tar.gz: 9c0bba21fc70063e684e40c26b588e22d7c3461b
 SHA512:
-  metadata.gz: 4cfa93793297b5cd39addae8ec7b6b18c641cebe06a54392558811a292086c78f22edd4e9ca5676750b9d290dc671b3a087723570571579b344f410518a0dd5d
-  data.tar.gz: 3e7ab5bd33f70a58e086772bb92c39106ecec63471799559f6e12211f4e9536b5543c8d1b4afa987bc93f4f7ebe230eea4e17b0a3d12e2840f21ca268bd046a4
+  metadata.gz: c6bc8ee217b1ed4d753e60c6a5a0e3826b5d9c044e9d2e410317e80368411f94b2351207e186f9e321daa4a8e01c6d2166bd50a902385a7f763c7f0105ab50a0
+  data.tar.gz: 50bb725b9af13a521756d9d0e94e02dfc9338039e2a66f2b990a5bf60ede7910dd3486d68bd19ee1ea7451ee512d8d3d256a21524383173a400055724ef99f46

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

@@ -2,7 +2,7 @@ module Fluent
   module Plugin
     module Cloudwatch
       module Logs
-        VERSION = "0.3.0"
+        VERSION = "0.3.1"
       end
     end
   end

data/lib/fluent/plugin/out_cloudwatch_logs.rb

@@ -73,8 +73,7 @@ module Fluent
     end
 
     def write(chunk)
-      events = []
-      chunk.enum_for(:msgpack_each).chunk {|tag, time, record|
+      chunk.enum_for(:msgpack_each).group_by {|tag, time, record|
         group = case
                 when @use_tag_as_group
                   tag
@@ -123,6 +122,7 @@ module Fluent
           end
         end
 
+        events = []
         rs.each do |t, time, record|
           time_ms = time * 1000
 

data/test/plugin/test_out_cloudwatch_logs.rb

@@ -254,18 +254,37 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
     log_stream_name_key stream_name_key
     EOC
 
-    record = {'cloudwatch' => 'logs1', 'message' => 'message1', 'group_name_key' => log_group_name, 'stream_name_key' => log_stream_name}
+    stream1 = new_log_stream
+    stream2 = new_log_stream
+
+    records = [
+      {'cloudwatch' => 'logs1', 'message' => 'message1', 'group_name_key' => log_group_name, 'stream_name_key' => stream1},
+      {'cloudwatch' => 'logs2', 'message' => 'message1', 'group_name_key' => log_group_name, 'stream_name_key' => stream2},
+      {'cloudwatch' => 'logs3', 'message' => 'message1', 'group_name_key' => log_group_name, 'stream_name_key' => stream1},
+    ]
 
     time = Time.now
-    d.emit(record, time.to_i)
+    records.each_with_index do |record, i|
+      d.emit(record, time.to_i + i)
+    end
     d.run
 
+    # Call API once for each stream
+    assert_equal(2, d.instance.log.logs.select {|l| l =~ /Calling PutLogEvents API/ }.size)
+
     sleep 10
 
-    events = get_log_events(log_group_name, log_stream_name)
-    assert_equal(1, events.size)
+    events = get_log_events(log_group_name, stream1)
+    assert_equal(2, events.size)
     assert_equal(time.to_i * 1000, events[0].timestamp)
-    assert_equal(record, JSON.parse(events[0].message))
+    assert_equal((time.to_i + 2) * 1000, events[1].timestamp)
+    assert_equal(records[0], JSON.parse(events[0].message))
+    assert_equal(records[2], JSON.parse(events[1].message))
+
+    events = get_log_events(log_group_name, stream2)
+    assert_equal(1, events.size)
+    assert_equal((time.to_i + 1) * 1000, events[0].timestamp)
+    assert_equal(records[1], JSON.parse(events[0].message))
   end
 
   def test_remove_log_group_name_key_and_remove_log_stream_name_key

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'mocha/test_unit'
 require 'fluent/test'
+require 'securerandom'
 
 require 'aws-sdk-core'
 
@@ -38,7 +39,8 @@ module CloudwatchLogsTestHelper
   end
 
   def new_log_stream(log_stream_name_prefix = nil)
-    @log_stream_name = log_stream_name_prefix ? log_stream_name_prefix + Time.now.to_f.to_s : Time.now.to_f.to_s
+    uuid = SecureRandom.uuid
+    @log_stream_name = log_stream_name_prefix ? log_stream_name_prefix + uuid : uuid
   end
 
   def clear_log_group

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch-logs
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ryota Arai