fluent-plugin-cloudwatch-logs 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7baf9a45fc12d45a5ecf04306e5717b17fdb718c
-  data.tar.gz: a145ed2460f880160485ab59e6323d9d2e0bed43
+  metadata.gz: 5082b725cf548ffea0fb7e779c6c24a4d7bb7909
+  data.tar.gz: 6a8dbc8986550ec45e9fb3518316f19d7267ac8e
 SHA512:
-  metadata.gz: d2bacc619ec53344851d7c26f470202f8e35bc052c6bc15a72e1ef150fc8ece162c8b127f3cbdd95be38332df70ada8b5e634190a38aae230400b7e67b820970
-  data.tar.gz: 561e946c9445d3bdce36c5a3ab00917ad3ae70daacad75545a4a936c73ad130dcee0ad6704c0e19b12ac38c019e471ce800844cb6978827bf1816ffcd95c00fb
+  metadata.gz: f8321eeaa7a481dae684a5908446782a5ba570b1bcc9bbeec86a63d4a365340923a4478536a471a4480aa32b6017a537c5023ee87dd5d0144d62cab252f0c6fd
+  data.tar.gz: c57ab7ca6be0756ad4377b3b7cf12cc69b6f4e141b82c5c5cc664fe493fe22f705758c5e3c4be2d00fcec55d98c892c8c325c3f17b453acd899b7ccf266b01cb

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

@@ -2,7 +2,7 @@ module Fluent
   module Plugin
     module Cloudwatch
       module Logs
-        VERSION = "0.2.2"
+        VERSION = "0.2.3"
       end
     end
   end

data/lib/fluent/plugin/out_cloudwatch_logs.rb

@@ -25,6 +25,7 @@ module Fluent
     config_param :http_proxy, :string, default: nil
 
     MAX_EVENTS_SIZE = 1_048_576
+    EVENT_HEADER_SIZE = 26
 
     unless method_defined?(:log)
       define_method(:log) { $log }
@@ -158,25 +159,30 @@ module Fluent
 
       # The maximum batch size is 1,048,576 bytes, and this size is calculated as the sum of all event messages in UTF-8, plus 26 bytes for each log event.
       # http://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutLogEvents.html
+      total_bytesize = 0
       while event = events.shift
         new_chunk = chunk + [event]
+        event_bytesize = event[:message].bytesize + EVENT_HEADER_SIZE
+
         chunk_span_too_big = new_chunk.size > 1 && new_chunk[-1][:timestamp] - new_chunk[0][:timestamp] >= 1000 * 60 * 60 * 24
-        chunk_too_big = new_chunk.inject(0) {|sum, e| sum + e[:message].bytesize + 26 } > MAX_EVENTS_SIZE
+        chunk_too_big = total_bytesize + event_bytesize > MAX_EVENTS_SIZE
         chunk_too_long = @max_events_per_batch && chunk.size >= @max_events_per_batch
         if chunk_too_big or chunk_span_too_big or chunk_too_long
-          put_events(group_name, stream_name, chunk)
+          put_events(group_name, stream_name, chunk, total_bytesize)
           chunk = [event]
+          total_bytesize = event_bytesize
         else
           chunk << event
+          total_bytesize += event_bytesize
         end
       end
 
       unless chunk.empty?
-        put_events(group_name, stream_name, chunk)
+        put_events(group_name, stream_name, chunk, total_bytesize)
       end
     end
 
-    def put_events(group_name, stream_name, events)
+    def put_events(group_name, stream_name, events, events_bytesize)
       args = {
         log_events: events,
         log_group_name: group_name,
@@ -185,6 +191,13 @@ module Fluent
       token = next_sequence_token(group_name, stream_name)
       args[:sequence_token] = token if token
 
+      log.debug "Calling PutLogEvents API", {
+        "group" => group_name,
+        "stream" => stream_name,
+        "events_count" => events.size,
+        "events_bytesize" => events_bytesize,
+      }
+
       response = @logs.put_log_events(args)
       store_next_sequence_token(group_name, stream_name, response.next_sequence_token)
     end

data/test/plugin/test_out_cloudwatch_logs.rb

@@ -51,6 +51,8 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
     assert_equal('{"cloudwatch":"logs1"}', events[0].message)
     assert_equal((time.to_i + 1) * 1000, events[1].timestamp)
     assert_equal('{"cloudwatch":"logs2"}', events[1].message)
+
+    assert_match(/Calling PutLogEvents API/, d.instance.log.logs[0])
   end
 
   def test_write_utf8

metadata

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