logstash-output-awslogs 0.1.8 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf9d3bfff7bf14387d23842f9b02f53c3ab558ca
-  data.tar.gz: 13d1412afb9220821f2b22964706075a4fe4a437
+  metadata.gz: 3bbaa5d8875a0a0c0953b8f621545f0a7fc6ab40
+  data.tar.gz: b0ed0c04c50f70dc5fbb9af910e05125f634d2a2
 SHA512:
-  metadata.gz: 60cb4ae5ac77ad1c56ef81133659cf2b7d5046d96b78ba0f036ba048aa558e82ae46ac2fffecdec437a7bbe04a9258adff82be795a6346d4ba0bc5febd621c1f
-  data.tar.gz: f7021983778d560315b7c6ec8397daa406861fe0b0393b44d104b2e103f41e187037eb990e0adf969de0b4a48fa2c6c1c4b5b6d171af15a15f877a4916a7f2e3
+  metadata.gz: 9de2dbffa4ad46c0ad35af85bef3a2927ebdc3228e2ca95645acba67073c322568306214c99e78342312ca8a63adc619538abd375af130badf77ca6ad725a9fb
+  data.tar.gz: 975f7760655ca0c8096b3e9408adf1692a0263b4e8b0fea48c40c343e2066bae6fa508be853ef03231936c183131ddeb3c23d3b0ffdf85411dc16376db522962

data/lib/logstash/outputs/awslogs.rb

@@ -1,8 +1,9 @@
-# encoding: utf-8
-require "logstash/outputs/base"
-require "logstash/namespace"
-require "logstash/plugin_mixins/aws_config"
-require "aws-sdk"
+# frozen_string_literal: true
+
+require 'logstash/outputs/base'
+require 'logstash/namespace'
+require 'logstash/plugin_mixins/aws_config'
+require 'aws-sdk'
 
 Aws.eager_autoload!
 
@@ -10,73 +11,74 @@ Aws.eager_autoload!
 class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
   include LogStash::PluginMixins::AwsConfig::V2
 
-  config_name "awslogs"
-  default :codec, "line"
+  config_name 'awslogs'
+  default :codec, 'line'
 
-  config :log_group_name, :validate => :string, :required => true
-  config :log_stream_name, :validate => :string, :required => true
+  config :log_group_name, validate: :string, required: true
+  config :log_stream_name, validate: :string, required: true
 
   public
+
   def register
     @client = Aws::CloudWatchLogs::Client.new(aws_options_hash)
     @next_sequence_tokens = {}
   end # def register
 
   public
+
   def multi_receive_encoded(events_and_encoded)
     to_send = {}
     sequence_tokens = {}
 
-    events_and_encoded.each do |event, encoded|
+    events_and_encoded.each do |event, _encoded|
       event_log_stream_name = event.sprintf(log_stream_name)
       event_log_group_name = event.sprintf(log_group_name)
 
       next_sequence_token_key = [event_log_group_name, event_log_stream_name]
-      if ! to_send.keys.include? next_sequence_token_key
+      unless to_send.keys.include? next_sequence_token_key
         to_send.store(next_sequence_token_key, [])
       end
-      to_send[next_sequence_token_key].push({
+      to_send[next_sequence_token_key].push(
         timestamp: (event.timestamp.time.to_f * 1000).to_int,
-        message: event.get("message"),
-      })
+        message: event.get('message')
+      )
     end
 
     to_send.each do |event_log_names, _events|
       event_log_group_name = event_log_names[0]
       event_log_stream_name = event_log_names[1]
-      unless 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|
-            response.log_streams.each do |log_stream_data|
-              sequence_tokens[event_log_group_name].push({ "#{log_stream_data.log_stream_name}": "#{log_stream_data.upload_sequence_token}"})
-            end
-          end
-        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")
-          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])
-          rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
-            @logger.info("Log stream #{send_opts[:log_stream_name]} already exists")
-          rescue Exception => e
-            @logger.error(e)
+      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|
+          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
-          retry
-        rescue Aws::CloudWatchLogs::Errors::ThrottlingException => e
-          @logger.info("Logs throttling, retry")
-          retry
         end
+      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)
+        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')
+        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]
@@ -84,11 +86,11 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
 
       ident_opts = {
         log_group_name: event_log_group_name,
-        log_stream_name: event_log_stream_name,
+        log_stream_name: event_log_stream_name
       }
-      send_opts = ident_opts.merge({
-        log_events: log_events,
-      })
+      send_opts = ident_opts.merge(
+        log_events: log_events
+      )
 
       if @next_sequence_tokens.keys.include? next_sequence_token_key
         send_opts[:sequence_token] = @next_sequence_tokens[next_sequence_token_key]
@@ -96,18 +98,26 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
         send_opts[:sequence_token] = sequence_tokens[event_log_group_name][event_log_stream_name]
       else
         begin
-            @client.create_log_stream(ident_opts)
+          @client.create_log_stream(ident_opts)
+          until sequence_tokens[event_log_group_name][event_log_stream_name] do
+            @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
+          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")
+          @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
@@ -115,23 +125,23 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
           end
           retry
         rescue Aws::CloudWatchLogs::Errors::ThrottlingException => e
-          @logger.info("Logs throttling, retry")
+          @logger.info('Logs throttling, retry')
           retry
         end
       end
       begin
         resp = @client.put_log_events(send_opts)
       rescue Aws::CloudWatchLogs::Errors::ResourceNotFoundException => e
-        @logger.info("Will create log group/stream and retry")
+        @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
@@ -139,11 +149,13 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
         end
         retry
         # TODO: handle rejected events with debug message
-      @next_sequence_tokens.store(next_sequence_token_key, resp.next_sequence_token)
       rescue Aws::CloudWatchLogs::Errors::ThrottlingException => e
-        @logger.info("Logs throttling, retry")
+        @logger.info('Logs throttling, retry')
         retry
+      rescue Exception => e
+        @logger.error("Err: #{e}; Opts: #{send_opts.each { |k,v| "#{k.to_s} : #{v.to_s}" }}")
       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.8'
+  s.version       = '0.1.13'
   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.8
+  version: 0.1.13
 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