logstash-output-awslogs 0.1.29 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6d187d9a46e3d3b58b9cc7782499de7de990eca4eb2ba212b03abe8ff29d42e
-  data.tar.gz: 217c5ae517cfc1333ec150499be174543087a9063374a1a65ae66fcc3525f909
+  metadata.gz: c474bc4a5ef1f07fa80d864aff9d8117a03e538a1803d5580f568ad247184657
+  data.tar.gz: 3ba1244c07a40439e0720db526d977f50e4927f7880f0d84c99cdee00222be85
 SHA512:
-  metadata.gz: deccb83b39e6b80517fc1682fd877a385c60c1ff0ff82854dc87f12950a6399a7d9a025cb14602965ea841e7daee35a6be3e0d3eaa62ad8c969e56f26982f2fb
-  data.tar.gz: eec9cb42b0ffc31a6b7a39ca1d53fb0eea33bc4494b47e2a80dfd1d7efb1dd08fb12ffc3b843476ca9ae3ee06d2a518064d5701f4486fe624c53fc76066ffff6
+  metadata.gz: 85c3a5ed5b1fe574d69d3a120f6e69bec74a2cef47803d089dec0b837c11189391bfc822828f869e32f36c000296df8a216b5cc31a74ed7924b4bd12cd9673a3
+  data.tar.gz: 114a6efe2abb2909f2245bcb92aca3beea9076b809c56374c5ae8099eebc0783a6cc083ef4f7c3c6a3df5046c999e0f4297d5e376e779ddc1fb56b0999c16b1c

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'
+require 'aws-sdk-cloudwatchlogs'
 
 Aws.eager_autoload!
 
@@ -51,42 +51,6 @@ 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]
@@ -103,11 +67,9 @@ 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
-          @client.create_log_stream(ident_opts)
+          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
@@ -121,42 +83,13 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
             @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::ThrottlingException => e
-          @logger.info('Creating log streams throttling, retry')
+          @logger.info('Logs 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.29'
+  s.version       = '0.1.30'
   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", '~> 1'
   s.add_development_dependency "logstash-devutils"
-  s.add_development_dependency "aws-sdk-cloudwatchlogs"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-awslogs
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.30
 platform: ruby
 authors:
 - Anton Klyba
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -55,24 +55,24 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  name: logstash-devutils
+        version: '1'
+  name: aws-sdk-cloudwatchlogs
   prerelease: false
-  type: :development
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: aws-sdk-cloudwatchlogs
+  name: logstash-devutils
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement