logstash-output-awslogs 0.1.21 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 583b99ac1c82f6ce8a4062c69e3c5573ee4423c367a50c17ab22f74a7c0a5f94
-  data.tar.gz: 77dc1748568954518bc4086b5fa4d9b9f30060d2741a4cab129c63485083a3f7
+  metadata.gz: 268bd7af65517b4eab80732976110a10662de589fd07108448e1be71b33adfe7
+  data.tar.gz: f0861dffc5571fd36deff09aca9f27abc09201be1df7e83582360f54e4a8e0db
 SHA512:
-  metadata.gz: d06f504f05c63fbf005395730b2a00c87b82a68c904875997bda8ddfa4ec669ec4a4acc6eae864c64ca4e49cd56d477c1c119f574d4bec3f06a7ee6bd05abfd1
-  data.tar.gz: 801d5a4a3b8c20edd00f5e7d356f7ac2a0fcafa38a055919ef92f8665d7067dce8ed6e0a1074fe16539770ea8b9ffce7a83538e27a5171e9cff2418a206e4079
+  metadata.gz: 41cd461560ed5d827b61e4e560c08754a07255f829805eed9ec36e6a8c669b5eba974c616919d6f8b96093ce3b5f534bd23a1dd81b7a64aa3363d4098534652a
+  data.tar.gz: d2388be26aa0bcb7876f88e4fd4e5ae8c67f1cc91d70e0fa0092caecc73674c3370e996b79ad3c6b0d34bd9b786d8ceabbbc20cb9a5d1a0cfbf5fd3f2b83f5a9

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,15 +38,25 @@ 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') && !event.get('message').empty?
+        to_send[next_sequence_token_key].push(
+          timestamp: (event.timestamp.time.to_f * 1000).to_int,
+          message: event.get('message')
+        )
+      else
+        to_send[next_sequence_token_key].push(
+            timestamp: (event.timestamp.time.to_f * 1000).to_int,
+            message: encoded
+        )
+      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
@@ -135,6 +145,9 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
         end
         retry
         # TODO: handle rejected events with debug message
+      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

data/logstash-output-awslogs.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-awslogs'
-  s.version       = '0.1.21'
+  s.version       = '0.1.26'
   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.21
+  version: 0.1.26
 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