logstash-output-awslogs 0.1.19 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f22136ec202151e2601a9c93299d84797c1f16930c9236a495feabaf81f6444a
-  data.tar.gz: 9f7c115e01fd43e940a510e026157b40d051d2d7d246e783ae4107a6fba73b0b
+  metadata.gz: 6c79c590f6a8db8e37f39e91dfabe4f17697bd02d29aaa1a36148d4780eafe0b
+  data.tar.gz: f646423c73d78e6ed3861af4fb27952c5c12e626fc0f4b35060b2ce0a5661d94
 SHA512:
-  metadata.gz: a30e56087c9ec65e1acb13dba932515e558e7fbccdc6b780d3963ee9b5ad79afcc31832fe57386402da6eef09e4cf4ac3647ba6524d16c6cdab216c7ecca93f2
-  data.tar.gz: 128aa9961f0ad5ec991243bc9442008ca05a1ee2b54466cc85edea0dafb75f5bb7db0646e0c36299766a875a607dd367429455c0787dbd992be1c20032d9fa39
+  metadata.gz: 07d4fc8717742ceb35b20d1ed6be7e9a0f6ae058b19c7fbf9384ffa2be91565e3007e01a39d6aebd3f2c16ee7095f61b6e0b24343e2ff86e9c4211d8daac8480
+  data.tar.gz: 4097286d38c5bc9ef062a3974012d36e54e8b3444471fcd82db0d91400c9fb2a8c4f2c6277896c1fae3cdb1d8b4e4eac30824d426b7288b889fdc552f36d99dc

data/lib/logstash/outputs/awslogs.rb

@@ -30,7 +30,7 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
     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)
 
@@ -38,31 +38,48 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
       unless to_send.keys.include? next_sequence_token_key
         to_send.store(next_sequence_token_key, [])
       end
-      to_send[next_sequence_token_key].push(
-        timestamp: (event.timestamp.time.to_f * 1000).to_int,
-        message: event.get('message')
-      )
+      if event.get('message')&.empty?
+        to_send[next_sequence_token_key].push(
+          timestamp: (event.timestamp.time.to_f * 1000).to_int,
+          message: encoded
+        )
+      else
+        to_send[next_sequence_token_key].push(
+            timestamp: (event.timestamp.time.to_f * 1000).to_int,
+            message: event.get('message')
+        )
+      end
     end
 
+    group_names = []
     to_send.each do |event_log_names, _events|
       event_log_group_name = event_log_names[0]
-      next if sequence_tokens.keys.include? event_log_group_name
+      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
 
-      sequence_tokens.store(event_log_group_name, {})
+    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: event_log_group_name}).each do |response|
+        @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[event_log_group_name][log_stream_data.log_stream_name.to_s] = log_stream_data.upload_sequence_token.to_s
+              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/stream and retry')
+        @logger.info("Will create log group #{log_group_name} and retry")
         begin
-          @client.create_log_group({log_group_name: event_log_group_name})
+          @client.create_log_group({log_group_name: log_group_name})
         rescue Aws::CloudWatchLogs::Errors::ResourceAlreadyExistsException => e
-          @logger.info("Log group #{event_log_group_name} already exists")
+          @logger.info("Log group #{log_group_name} already exists")
         end
         retry
       rescue Aws::CloudWatchLogs::Errors::ThrottlingException => e
@@ -107,6 +124,8 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
         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

data/logstash-output-awslogs.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-awslogs'
-  s.version       = '0.1.19'
+  s.version       = '0.1.24'
   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.19
+  version: 0.1.24
 platform: ruby
 authors:
 - Anton Klyba
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement