fluent-plugin-cloudwatch-logs 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea446d3a1a05b1a484323cb46096a44f7aed765a
-  data.tar.gz: cafcf79e24b288ed07b6585eb253f204da92c762
+  metadata.gz: d4238d9fd741cabef203f35c414b70d13955314f
+  data.tar.gz: d8f44326e2452d24b3f33c0cf2950a09187ec664
 SHA512:
-  metadata.gz: e5c6b86471a03fd306f247d85e28389bcd0dd0bd7b6e7e33ad9bbc49bf543f14c572127c649066b3a663fd8ac3cff78894b7be3147c2c01fe5876be750884cd7
-  data.tar.gz: d399ec8bf3e3704a0d9cf85bea432c0dd817f933ed2039d9459ceff03c162d9c6b59775a70c5e3a5b084b85f71097799c8191d15253bd75eb2aed744d6f87432
+  metadata.gz: 4cfa93793297b5cd39addae8ec7b6b18c641cebe06a54392558811a292086c78f22edd4e9ca5676750b9d290dc671b3a087723570571579b344f410518a0dd5d
+  data.tar.gz: 3e7ab5bd33f70a58e086772bb92c39106ecec63471799559f6e12211f4e9536b5543c8d1b4afa987bc93f4f7ebe230eea4e17b0a3d12e2840f21ca268bd046a4

data/README.md

@@ -146,6 +146,10 @@ Or, If you do not want to use IAM roll or ENV(this is just like writing to confi
 $ rake aws_key_id=YOUR_ACCESS_KEY aws_sec_key=YOUR_SECRET_KEY region=us-east-1 test
 ```
 
+## Caution
+
+- If an event message exceeds API limit (256KB), the event will be discarded.
+
 ## TODO
 
 * out_cloudwatch_logs

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

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

data/lib/fluent/plugin/out_cloudwatch_logs.rb

@@ -28,6 +28,7 @@ module Fluent
     config_param :put_log_events_disable_retry_limit, :bool, default: false
 
     MAX_EVENTS_SIZE = 1_048_576
+    MAX_EVENT_SIZE = 256 * 1024
     EVENT_HEADER_SIZE = 26
 
     unless method_defined?(:log)
@@ -164,8 +165,13 @@ module Fluent
       # 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
+        if MAX_EVENT_SIZE < event_bytesize
+          log.warn "Log event is discarded because it is too large: #{event_bytesize} bytes exceeds limit of #{MAX_EVENT_SIZE}"
+          break
+        end
+
+        new_chunk = chunk + [event]
 
         chunk_span_too_big = new_chunk.size > 1 && new_chunk[-1][:timestamp] - new_chunk[0][:timestamp] >= 1000 * 60 * 60 * 24
         chunk_too_big = total_bytesize + event_bytesize > MAX_EVENTS_SIZE

data/test/plugin/test_out_cloudwatch_logs.rb

@@ -334,6 +334,19 @@ put_log_events_retry_limit 1
     assert_match(/failed to PutLogEvents and throwing away/, d.instance.log.logs[5])
   end
 
+  def test_too_large_event
+    time = Time.now
+    d = create_driver(<<-EOC)
+#{default_config}
+log_group_name #{log_group_name}
+log_stream_name #{log_stream_name}
+    EOC
+    d.emit({'message' => '*' * 256 * 1024}, time.to_i)
+    d.run
+
+    assert_match(/Log event is discarded because it is too large: 262184 bytes exceeds limit of 262144$/, d.instance.log.logs[0])
+  end
+
   private
   def default_config
     <<-EOC

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch-logs
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd