logstash-output-awslogs 0.1.28 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb080097b3946429995c6e7e7f937a4f05bd416c9c21060186af4237cfd8f5a
-  data.tar.gz: 6c0d9183dc2e0aa601f74c7202033160f2fe9ed29f616342c09db2b82c7a3b42
+  metadata.gz: a6d187d9a46e3d3b58b9cc7782499de7de990eca4eb2ba212b03abe8ff29d42e
+  data.tar.gz: 217c5ae517cfc1333ec150499be174543087a9063374a1a65ae66fcc3525f909
 SHA512:
-  metadata.gz: 780c474b5299be93ed86071830ed410deb327d118c0d10c2952d350c31fd771fe88d1f9a7fffe36206134fdf9811076984b96617eb3e056826e38a5f63cf46d3
-  data.tar.gz: 3dbe092d6b64511a997879d595d56d6221b8d106e4c8b97e92fe08545364825b4feca4b8a48f0e75bbb6e0db8b5c545c1421dfc151d1369f8f8ee43d48c6329c
+  metadata.gz: deccb83b39e6b80517fc1682fd877a385c60c1ff0ff82854dc87f12950a6399a7d9a025cb14602965ea841e7daee35a6be3e0d3eaa62ad8c969e56f26982f2fb
+  data.tar.gz: eec9cb42b0ffc31a6b7a39ca1d53fb0eea33bc4494b47e2a80dfd1d7efb1dd08fb12ffc3b843476ca9ae3ee06d2a518064d5701f4486fe624c53fc76066ffff6

data/Gemfile

@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gemspec
+gemspec

data/lib/logstash/outputs/awslogs.rb

@@ -3,7 +3,7 @@
 require 'logstash/outputs/base'
 require 'logstash/namespace'
 require 'logstash/plugin_mixins/aws_config'
-require 'aws-sdk-cloudwatchlogs'
+require 'aws-sdk'
 
 Aws.eager_autoload!
 
@@ -28,6 +28,7 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
 
   def multi_receive_encoded(events_and_encoded)
     to_send = {}
+    sequence_tokens = {}
 
     events_and_encoded.each do |event, encoded|
       event_log_stream_name = event.sprintf(log_stream_name)
@@ -50,6 +51,43 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
       end
     end
 
+    group_names = []
+    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_sequence_token_key = [event_log_group_name, event_log_stream_name]
+      next if @next_sequence_tokens.keys.include? next_sequence_token_key
+      unless group_names.include? event_log_group_name
+        group_names.push(event_log_group_name)
+      end
+    end
+
+    group_names.each do |log_group_name|
+      unless sequence_tokens.keys.include? log_group_name
+        sequence_tokens.store(log_group_name, {})
+      end
+      begin
+        @client.describe_log_streams({log_group_name: log_group_name}).each do |response|
+          response.log_streams.each do |log_stream_data|
+            unless log_stream_data.upload_sequence_token&.empty?
+              sequence_tokens[log_group_name][log_stream_data.log_stream_name.to_s] = log_stream_data.upload_sequence_token.to_s
+            end
+          end
+        end
+      rescue Aws::CloudWatchLogs::Errors::ResourceNotFoundException => e
+        @logger.info("Will create log group #{log_group_name} and retry")
+        begin
+          @client.create_log_group({log_group_name: log_group_name})
+        rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
+          @logger.info("Log group #{log_group_name} already exists")
+        end
+        retry
+      rescue Aws::CloudWatchLogs::Errors::ThrottlingException => e
+        @logger.info('Describe streams throttling, retry')
+        retry
+      end
+    end
+
     to_send.each do |event_log_names, log_events|
       event_log_group_name = event_log_names[0]
       event_log_stream_name = event_log_names[1]
@@ -65,30 +103,60 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
 
       if @next_sequence_tokens.keys.include? next_sequence_token_key
         send_opts[:sequence_token] = @next_sequence_tokens[next_sequence_token_key]
+      elsif !sequence_tokens[event_log_group_name][event_log_stream_name]&.empty?
+        send_opts[:sequence_token] = sequence_tokens[event_log_group_name][event_log_stream_name]
       else
         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
+          @client.create_log_stream(ident_opts)
+        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]})
-          rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => _e
+          rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
             @logger.info("Log group #{send_opts[:log_group_name]} already exists")
           end
           begin
             @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
+          rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
             @logger.info("Log stream #{send_opts[:log_stream_name]} already exists")
           end
           retry
-        rescue  Aws::CloudWatchLogs::Errors::InvalidSequenceTokenException => e
-          send_opts[:sequence_token] = e.expected_sequence_token
-          retry
-        rescue Aws::CloudWatchLogs::Errors::LimitExceededException => e
-          @logger.info('Logs throttling, retry')
+        rescue Aws::CloudWatchLogs::Errors::ThrottlingException => e
+          @logger.info('Creating log streams throttling, retry')
           retry
+        rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
+          @logger.info("Log stream #{send_opts[:log_stream_name]} already exists")
+        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]})
+        rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
+          @logger.info("Log group #{send_opts[:log_group_name]} already exists")
+        end
+        begin
+          @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")
+        end
+        retry
+      rescue  Aws::CloudWatchLogs::Errors::InvalidSequenceTokenException => e
+        @logger.info(e.code)
+        response = @client.describe_log_streams({log_group_name: send_opts[:log_group_name], log_stream_name_prefix: send_opts[:log_stream_name]})
+        response.log_streams.each do |stream_data|
+          if stream_data.log_stream_name == send_opts[:log_stream_name]
+            send_opts[:sequence_token] = stream_data.upload_sequence_token
+            break
+          end
         end
+        retry
+      rescue Aws::CloudWatchLogs::Errors::ThrottlingException => e
+        @logger.info('Logs throttling, retry')
+        retry
       end
     end
   end # def multi_receive_encodeds

data/logstash-output-awslogs.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-awslogs'
-  s.version       = '0.1.28'
+  s.version       = '0.1.29'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Writes events to AWS CloudWatch logs.'
   s.homepage      = 'https://github.com/rickycook/logstash-output-awslogs'
@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
   s.add_runtime_dependency "logstash-codec-plain"
   s.add_runtime_dependency 'logstash-mixin-aws', '>= 4.3.0'
-  s.add_runtime_dependency 'aws-sdk-cloudwatchlogs'
   s.add_development_dependency "logstash-devutils"
+  s.add_development_dependency "aws-sdk-cloudwatchlogs"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-awslogs
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.29
 platform: ruby
 authors:
 - Anton Klyba
@@ -58,9 +58,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: aws-sdk-cloudwatchlogs
+  name: logstash-devutils
   prerelease: false
-  type: :runtime
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -72,7 +72,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
+  name: aws-sdk-cloudwatchlogs
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement