logstash-output-awslogs 0.1.12 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 777dc69291b2c3a307405c13583b5d3a2de1b2b9
-  data.tar.gz: 5829780c1044b8ed0461a6159cfaa1b3d3b987e9
+  metadata.gz: d401b9bf9bdc4cfbfcbfc67d15149c7808436cd7
+  data.tar.gz: 13457ea56d4948e7ba7e3dbffe01cc16054bf538
 SHA512:
-  metadata.gz: 4502d60ae7e11290500e1c4ef7ef5557b819bfc9a494f0ec31fdc17b147102cfc90a6633566df3c3fcfb761db0b583b29a667674583d9b1476f1d46abcddc780
-  data.tar.gz: 736b23303a5673eded828ff4a70bde9eaa3191bea43e7dda6d505f357325baaac6bb05b5db38c4f148a54bf2dc48fd8f24f18080b530feb25d65458287cac6db
+  metadata.gz: 2c592f05a971d09885c57092d163a0e05385c933cf74cd9db938f0b5c9a213dce542ed3636e73cd0afdcb4c56c9aa55f5af9415a59f08d075afb202c686f1604
+  data.tar.gz: 20736d09febf105024425cf86621948dd9a9d98b97901151f5fa2717e168d9b703a4569deb82d820fc3ef5074ae8b584c4d3e04dec0820d89cdd0eca9ce754a5

data/lib/logstash/outputs/awslogs.rb

@@ -46,12 +46,11 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
 
     to_send.each do |event_log_names, _events|
       event_log_group_name = event_log_names[0]
-      event_log_stream_name = event_log_names[1]
       next if sequence_tokens.keys.include? event_log_group_name
 
       sequence_tokens.store(event_log_group_name, {})
       begin
-        @client.describe_log_streams(log_group_name: event_log_group_name).each do |response|
+        @client.describe_log_streams({log_group_name: event_log_group_name}).each do |response|
           response.log_streams.each do |log_stream_data|
             sequence_tokens[event_log_group_name][log_stream_data.log_stream_name.to_s] = log_stream_data.upload_sequence_token.to_s
           end
@@ -59,22 +58,13 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
       rescue Aws::CloudWatchLogs::Errors::ResourceNotFoundException => e
         @logger.info('Will create log group/stream and retry')
         begin
-          @client.create_log_group(log_group_name: event_log_group_name)
+          @client.create_log_group({log_group_name: event_log_group_name})
         rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
           @logger.info("Log group #{event_log_group_name} already exists")
-        rescue Exception => e
-          @logger.error(e)
-        end
-        begin
-          @client.create_log_stream(log_group_name: event_log_group_name, log_stream_name: event_log_stream_name)
-        rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
-          @logger.info("Log stream #{event_log_stream_name} already exists")
-        rescue Exception => e
-          @logger.error(e)
         end
         retry
       rescue Aws::CloudWatchLogs::Errors::ThrottlingException => e
-        @logger.info('Logs throttling, retry')
+        @logger.info('Describe streams throttling, retry')
         retry
       end
     end
@@ -99,51 +89,38 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
       else
         begin
           @client.create_log_stream(ident_opts)
-          @client.describe_log_streams(log_group_name: event_log_group_name).each do |response|
-            response.log_streams.each do |log_stream_data|
-              sequence_tokens[event_log_group_name][log_stream_data.log_stream_name.to_s] = log_stream_data.upload_sequence_token.to_s
-            end
-          end
-          send_opts[:sequence_token] = sequence_tokens[event_log_group_name][event_log_stream_name]
         rescue Aws::CloudWatchLogs::Errors::ResourceNotFoundException => e
           @logger.info('Will create log group/stream and retry')
           begin
-            @client.create_log_group(log_group_name: send_opts[:log_group_name])
+            @client.create_log_group({log_group_name: send_opts[:log_group_name]})
           rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
             @logger.info("Log group #{send_opts[:log_group_name]} already exists")
-          rescue Exception => e
-            @logger.error(e)
           end
           begin
-            @client.create_log_stream(log_group_name: send_opts[:log_group_name], log_stream_name: send_opts[:log_stream_name])
+            @client.create_log_stream({log_group_name: send_opts[:log_group_name], log_stream_name: send_opts[:log_stream_name]})
           rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
             @logger.info("Log stream #{send_opts[:log_stream_name]} already exists")
-          rescue Exception => e
-            @logger.error(e)
           end
           retry
         rescue Aws::CloudWatchLogs::Errors::ThrottlingException => e
-          @logger.info('Logs throttling, retry')
+          @logger.info('Creating log streams throttling, retry')
           retry
         end
       end
       begin
         resp = @client.put_log_events(send_opts)
+        @next_sequence_tokens.store(next_sequence_token_key, resp.next_sequence_token)
       rescue Aws::CloudWatchLogs::Errors::ResourceNotFoundException => e
         @logger.info('Will create log group/stream and retry')
         begin
-          @client.create_log_group(log_group_name: send_opts[:log_group_name])
+          @client.create_log_group({log_group_name: send_opts[:log_group_name]})
         rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
           @logger.info("Log group #{send_opts[:log_group_name]} already exists")
-        rescue Exception => e
-          @logger.error(e)
         end
         begin
-          @client.create_log_stream(log_group_name: send_opts[:log_group_name], log_stream_name: send_opts[:log_stream_name])
+          @client.create_log_stream({log_group_name: send_opts[:log_group_name], log_stream_name: send_opts[:log_stream_name]})
         rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
           @logger.info("Log stream #{send_opts[:log_stream_name]} already exists")
-        rescue Exception => e
-          @logger.error(e)
         end
         retry
         # TODO: handle rejected events with debug message
@@ -151,7 +128,6 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
         @logger.info('Logs throttling, retry')
         retry
       end
-      @next_sequence_tokens.store(next_sequence_token_key, resp.next_sequence_token)
     end
   end # def multi_receive_encoded
 end # class LogStash::Outputs::Awslogs

data/logstash-output-awslogs.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-awslogs'
-  s.version       = '0.1.12'
+  s.version       = '0.1.17'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Writes events to AWS CloudWatch logs.'
   s.homepage      = 'https://github.com/rickycook/logstash-output-awslogs'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-awslogs
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.17
 platform: ruby
 authors:
 - Anton Klyba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api