fluent-plugin-cloudwatch-logs 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11a5a24eb3978bb6d5b29d3d08cf5b49bfd9eed85e3a3b6df46adedf31e85458
-  data.tar.gz: 1193f782abef03c1f89c18b25ccb2ad2d3d774681a5e489d860e5baefb71beb4
+  metadata.gz: f405e2301a22e37b9768748f88df73b9ecba6e1b5311f78992c9117b45da95f8
+  data.tar.gz: 51973be01ee296b0fcb5f7abb26605c0f67385fea4449b7bc301281667185406
 SHA512:
-  metadata.gz: 4f5d00f59b8a9c9652ab7b364bb13d9a51b6bc04ba7bcf058d2fb0a5705637c6b0156e93f94bb090f8c5e270d821a42f7b5ba7190e4ed0321f87b8d7a661f280
-  data.tar.gz: 32dd243642ac3d63ed8704a63074c611343a25c56a681d7c2ac8e298c8579c56ee82b4fe5f91d0ad6b236a0c094bfc86f3ba0f1b08fd4406e25e023dffec3c04
+  metadata.gz: '0439979ebd2e1e4d5bc8876ad652a1c790ff311f6857bfcf7f9a9d1748d66bea5acb01944939947ac8d1171d76faaadd40b6bf7238c32eef61efb995aa067087'
+  data.tar.gz: b6de5f1d520370a5a2fadba7da8960a11b3ded740155d7f6efa05db686a30bc3ed6e854274ed968ecd4a421dcbef6b01dccc259e5daa9dce3ca5570b4668163e

data/fluent-plugin-cloudwatch-logs.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Ryota Arai"]
   spec.email         = ["ryota.arai@gmail.com"]
   spec.summary       = %q{CloudWatch Logs Plugin for Fluentd}
-  spec.homepage      = "https://github.com/ryotarai/fluent-plugin-cloudwatch-logs"
+  spec.homepage      = "https://github.com/fluent-plugins-nursery/fluent-plugin-cloudwatch-logs"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

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

@@ -2,7 +2,7 @@ module Fluent
   module Plugin
     module Cloudwatch
       module Logs
-        VERSION = "0.5.0"
+        VERSION = "0.5.1"
       end
     end
   end

data/lib/fluent/plugin/out_cloudwatch_logs.rb

@@ -4,6 +4,7 @@ require 'yajl'
 
 module Fluent::Plugin
   class CloudwatchLogsOutput < Output
+    include Fluent::MessagePackFactory::Mixin
     Fluent::Plugin.register_output('cloudwatch_logs', self)
 
     helpers :compat_parameters, :inject
@@ -12,6 +13,7 @@ module Fluent::Plugin
 
     config_param :aws_key_id, :string, :default => nil, :secret => true
     config_param :aws_sec_key, :string, :default => nil, :secret => true
+    config_param :aws_instance_profile_credentials_retries, :integer, default: nil
     config_param :aws_use_sts, :bool, default: false
     config_param :aws_sts_role_arn, :string, default: nil
     config_param :aws_sts_session_name, :string, default: 'fluentd'
@@ -83,6 +85,7 @@ module Fluent::Plugin
       options = {}
       options[:region] = @region if @region
       options[:endpoint] = @endpoint if @endpoint
+      options[:instance_profile_credentials_retries] = @aws_instance_profile_credentials_retries if @aws_instance_profile_credentials_retries
 
       if @aws_use_sts
         Aws.config[:region] = options[:region]
@@ -108,7 +111,7 @@ module Fluent::Plugin
 
     def format(tag, time, record)
       record = inject_values_to_record(tag, time, record)
-      [tag, time, record].to_msgpack
+      msgpack_packer.pack([tag, time, record]).to_s
     end
 
     def formatted_to_msgpack_binary?
@@ -208,7 +211,7 @@ module Fluent::Plugin
 
         events = []
         rs.each do |t, time, record|
-          time_ms = time * 1000
+          time_ms = (time.to_f * 1000).floor
 
           scrub_record!(record)
           if @message_keys

data/test/plugin/test_out_cloudwatch_logs.rb

@@ -50,6 +50,7 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
     time = event_time
     d.run(default_tag: fluentd_tag, flush: true) do
       d.feed(time, {'cloudwatch' => 'logs1'})
+      # Addition converts EventTime to seconds
       d.feed(time + 1, {'cloudwatch' => 'logs2'})
     end
 
@@ -58,12 +59,12 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
     logs = d.logs
     events = get_log_events
     assert_equal(2, events.size)
-    assert_equal(time.to_i * 1000, events[0].timestamp)
+    assert_equal((time.to_f * 1000).floor, events[0].timestamp)
     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(logs.any?{|log| log.include?("Calling PutLogEvents API") })
+    assert(logs.any?{|log| log.include?("Called PutLogEvents API") })
   end
 
   def test_write_utf8
@@ -79,7 +80,7 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
 
     events = get_log_events
     assert_equal(1, events.size)
-    assert_equal(time.to_i * 1000, events[0].timestamp)
+    assert_equal((time.to_f * 1000).floor, events[0].timestamp)
     assert_equal('{"cloudwatch":"これは日本語です"}', events[0].message)
   end
 
@@ -105,7 +106,7 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
     assert_equal(3, events.size)
     assert_equal((time.to_i - 60 * 60 * 25) * 1000, events[0].timestamp)
     assert_equal('{"cloudwatch":"logs0"}', events[0].message)
-    assert_equal((time.to_i ) * 1000, events[1].timestamp)
+    assert_equal((time.to_f * 1000).floor, events[1].timestamp)
     assert_equal('{"cloudwatch":"logs1"}', events[1].message)
     assert_equal((time.to_i + 1) * 1000, events[2].timestamp)
     assert_equal('{"cloudwatch":"logs2"}', events[2].message)
@@ -131,7 +132,7 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
 
     events = get_log_events
     assert_equal(2, events.size)
-    assert_equal(time.to_i * 1000, events[0].timestamp)
+    assert_equal((time.to_f * 1000).floor, events[0].timestamp)
     assert_equal('message1 logs1', events[0].message)
     assert_equal((time.to_i + 1) * 1000, events[1].timestamp)
     assert_equal('message2 logs2', events[1].message)
@@ -158,7 +159,7 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
 
     events = get_log_events
     assert_equal(2, events.size)
-    assert_equal(time.to_i * 1000, events[0].timestamp)
+    assert_equal((time.to_f * 1000).floor, events[0].timestamp)
     assert_equal('message1 l', events[0].message)
     assert_equal((time.to_i + 1) * 1000, events[1].timestamp)
     assert_equal('message2 l', events[1].message)
@@ -184,7 +185,7 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
 
     events = get_log_events(fluentd_tag)
     assert_equal(2, events.size)
-    assert_equal(time.to_i * 1000, events[0].timestamp)
+    assert_equal((time.to_f * 1000).floor, events[0].timestamp)
     assert_equal('message1 logs1', events[0].message)
     assert_equal((time.to_i + 1) * 1000, events[1].timestamp)
     assert_equal('message2 logs2', events[1].message)
@@ -210,7 +211,7 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
 
     events = get_log_events(log_group_name, fluentd_tag)
     assert_equal(2, events.size)
-    assert_equal(time.to_i * 1000, events[0].timestamp)
+    assert_equal((time.to_f * 1000).floor, events[0].timestamp)
     assert_equal('message1 logs1', events[0].message)
     assert_equal((time.to_i + 1) * 1000, events[1].timestamp)
     assert_equal('message2 logs2', events[1].message)
@@ -237,7 +238,7 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
 
     events = get_log_events
     assert_equal(2, events.size)
-    assert_equal(time.to_i * 1000, events[0].timestamp)
+    assert_equal((time.to_f * 1000).floor, events[0].timestamp)
     assert_equal("{\"cloudwatch\":\"logs1\",\"time\":\"#{Time.at(time.to_r).utc.strftime("%Y-%m-%dT%H:%M:%SZ")}\"}", events[0].message)
     assert_equal((time.to_i + 1) * 1000, events[1].timestamp)
     assert_equal("{\"cloudwatch\":\"logs2\",\"time\":\"#{Time.at((time+1).to_r).utc.strftime("%Y-%m-%dT%H:%M:%SZ")}\"}", events[1].message)
@@ -264,7 +265,7 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
 
     events = get_log_events
     assert_equal(2, events.size)
-    assert_equal(time.to_i * 1000, events[0].timestamp)
+    assert_equal((time.to_f * 1000).floor, events[0].timestamp)
     assert_equal("{\"cloudwatch\":\"logs1\",\"time\":\"#{Time.at(time.to_r).strftime("%Y-%m-%dT%H:%M:%S%:z")}\"}", events[0].message)
     assert_equal((time.to_i + 1) * 1000, events[1].timestamp)
     assert_equal("{\"cloudwatch\":\"logs2\",\"time\":\"#{Time.at((time+1).to_r).to_time.strftime("%Y-%m-%dT%H:%M:%S%:z")}\"}", events[1].message)
@@ -298,7 +299,7 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
 
     logs = d.logs
     # Call API once for each stream
-    assert_equal(2, logs.select {|l| l =~ /Calling PutLogEvents API/ }.size)
+    assert_equal(2, logs.select {|l| l =~ /Called PutLogEvents API/ }.size)
 
     sleep 10
 
@@ -335,7 +336,7 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
 
     events = get_log_events(log_group_name, log_stream_name)
     assert_equal(1, events.size)
-    assert_equal(time.to_i * 1000, events[0].timestamp)
+    assert_equal((time.to_f * 1000).floor, events[0].timestamp)
     assert_equal({'cloudwatch' => 'logs1', 'message' => 'message1'}, JSON.parse(events[0].message))
   end
 
@@ -420,7 +421,7 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
       end
     end
 
-    assert_match(/failed to set retention policy for Log group/, d.instance.log.logs[0])
+    assert_match(/failed to set retention policy for Log group/, d.logs[0])
   end
 
   def test_log_group_aws_tags_key
@@ -529,6 +530,7 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
 
   def test_retrying_on_throttling_exception
     resp = mock()
+    resp.expects(:rejected_log_events_info)
     resp.expects(:next_sequence_token)
     client = Aws::CloudWatchLogs::Client.new
     client.stubs(:put_log_events).
@@ -542,7 +544,7 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
     end
 
     logs = d.logs
-    assert_equal(2, logs.select {|l| l =~ /Calling PutLogEvents API/ }.size)
+    assert_equal(1, logs.select {|l| l =~ /Called PutLogEvents API/ }.size)
     assert_equal(1, logs.select {|l| l =~ /failed to PutLogEvents/ }.size)
     assert_equal(1, logs.select {|l| l =~ /retry succeeded/ }.size)
   end
@@ -551,7 +553,6 @@ class CloudwatchLogsOutputTest < Test::Unit::TestCase
     client = Aws::CloudWatchLogs::Client.new
     client.stubs(:put_log_events).
       raises(Aws::CloudWatchLogs::Errors::ThrottlingException.new(nil, "error"))
-
     time = Fluent::Engine.now
     d = create_driver(<<-EOC)
 #{default_config}
@@ -566,7 +567,7 @@ put_log_events_retry_limit 1
     end
 
     logs = d.logs
-    assert_equal(3, logs.select {|l| l =~ /Calling PutLogEvents API/ }.size)
+    assert_equal(0, logs.select {|l| l =~ /Called PutLogEvents API/ }.size)
     assert_equal(3, logs.select {|l| l =~ /failed to PutLogEvents/ }.size)
     assert_equal(1, logs.select {|l| l =~ /failed to PutLogEvents and discard logs/ }.size)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch-logs
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -115,7 +115,7 @@ files:
 - test/plugin/test_in_cloudwatch_logs.rb
 - test/plugin/test_out_cloudwatch_logs.rb
 - test/test_helper.rb
-homepage: https://github.com/ryotarai/fluent-plugin-cloudwatch-logs
+homepage: https://github.com/fluent-plugins-nursery/fluent-plugin-cloudwatch-logs
 licenses:
 - MIT
 metadata: {}