logstash-output-awslogs 0.1.27 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b101283f4c71649578a073eac435ecfc727cff3e2cbfea45458e64566b5a42aa
-  data.tar.gz: a7ab59be3ca3ca945f52dbb374764c8e869bb724b7e5e8f27c5bf01380a7b708
+  metadata.gz: 4fb080097b3946429995c6e7e7f937a4f05bd416c9c21060186af4237cfd8f5a
+  data.tar.gz: 6c0d9183dc2e0aa601f74c7202033160f2fe9ed29f616342c09db2b82c7a3b42
 SHA512:
-  metadata.gz: a44eef076664b96349d4da5d4178e997ba4cd838f11b54d85e000b21c5cdaa02a6543afc9d552c63f12752a55d6666a7b4c36d7c3e671da444908e16088b582a
-  data.tar.gz: 1f0d095dd7fe53c97b8d88b0ce80054f7b45c69fcd9abc109332c89b9299881191b0e94a889b0ce32cf86b7d7bed5359092b14bea3154d37ead7667403490ead
+  metadata.gz: 780c474b5299be93ed86071830ed410deb327d118c0d10c2952d350c31fd771fe88d1f9a7fffe36206134fdf9811076984b96617eb3e056826e38a5f63cf46d3
+  data.tar.gz: 3dbe092d6b64511a997879d595d56d6221b8d106e4c8b97e92fe08545364825b4feca4b8a48f0e75bbb6e0db8b5c545c1421dfc151d1369f8f8ee43d48c6329c

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'
+require 'aws-sdk-cloudwatchlogs'
 
 Aws.eager_autoload!
 
@@ -28,7 +28,6 @@ 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)
@@ -51,43 +50,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]
       event_log_stream_name = event_log_names[1]
@@ -103,53 +65,30 @@ 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)
-        rescue Aws::CloudWatchLogs::Errors::ResourceNotFoundException => e
+          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
+          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::ThrottlingException => e
-          @logger.info('Creating log streams throttling, 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')
           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
-        send_opts[:sequence_token] = e[:expected_sequence_token]
-        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.27'
+  s.version       = '0.1.28'
   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.27
+  version: 0.1.28
 platform: ruby
 authors:
 - Anton Klyba
@@ -58,9 +58,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
+  name: aws-sdk-cloudwatchlogs
   prerelease: false
-  type: :development
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -72,7 +72,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: aws-sdk-cloudwatchlogs
+  name: logstash-devutils
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement