fluent-plugin-cloudwatch-logs 0.3.5 → 0.3.6.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aba8ef4dd50f6f0c4a37a2edb7fb667918aee9b
-  data.tar.gz: 1575a679177cc6d17d9ee5cb9e2250529b40d77d
+  metadata.gz: c12a5ca93e93ed7c383c116fa4124d026acbd051
+  data.tar.gz: 19ba88bf69f5fffc9d3bd68aee5960d5bef371b2
 SHA512:
-  metadata.gz: bce5a3de1a1420545cfaf8e962c2f0f5d9b183e7415bf841f999d8dbddcc96253fb536a636574dbf73c0407c9324dd83fe8799d5c9d0b86b481e2d327cf4ed49
-  data.tar.gz: 2942f9779b4761c3bf5d436877891fc054b0b37f9a167ce97beefa6a55f2307625726f93d809b35fb9dea601641da9486fafa0e8944c91e0fd46856de75765aa
+  metadata.gz: 8a7d2bb1c0670f3ed0682446b93343d652193f0249663f0f404d7b58a581ea28d406dc49cabf5a16d4e227efe286616727c44dbd63999a727d4f0a48e5af28f7
+  data.tar.gz: d70643b39fab6f9db46753a5bb635a44b28161c77fef2cc9e08c1e4338dda38bcefea2ed899508097ef04831c155a6bce5d03f6ef749b653e4ef81b0087d32c9

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

@@ -2,7 +2,7 @@ module Fluent
   module Plugin
     module Cloudwatch
       module Logs
-        VERSION = "0.3.5"
+        VERSION = "0.3.6.pre1"
       end
     end
   end

data/lib/fluent/plugin/out_cloudwatch_logs.rb

@@ -218,7 +218,6 @@ module Fluent
         log_stream_name: stream_name,
       }
       token = next_sequence_token(group_name, stream_name)
-      args[:sequence_token] = token if token
 
       response = nil
       retry_count = 0
@@ -228,17 +227,21 @@ module Fluent
           "stream" => stream_name,
           "events_count" => events.size,
           "events_bytesize" => events_bytesize,
+          "sequence_token" => token,
         }
+
+        args[:sequence_token] = token if token
         begin
           response = @logs.put_log_events(args)
         rescue Aws::CloudWatchLogs::Errors::InvalidSequenceTokenException
+          sleep 1 # to avoid too many API calls
+          log_stream = find_log_stream(group_name, stream_name)
+          token = log_stream.upload_sequence_token
           log.warn "updating upload sequence token because InvalidSequenceTokenException occured", {
             "log_group" => group_name,
             "log_stream" => stream_name,
+            "new_sequence_token" => token,
           }
-          log_stream = find_log_stream(group_name, stream_name)
-          store_next_sequence_token(group_name, stream_name, log_stream.upload_sequence_token)
-          retry
         rescue Aws::CloudWatchLogs::Errors::ThrottlingException => err
           if !@put_log_events_disable_retry_limit && @put_log_events_retry_limit < retry_count
             log.error "failed to PutLogEvents and discard logs because retry count exceeded put_log_events_retry_limit", {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch-logs
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6.pre1
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -144,12 +144,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: CloudWatch Logs Plugin for Fluentd