logstash-output-awslogs 0.1.22 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9584b5be53cc5cd5f7397547f5fa880085c55ab14a37cba3bb16684976ddeda3
-  data.tar.gz: 88796ea88b9cd8d735cd5f185c0b9c98e4d14ffb3927f6eaf1a6db1d83a3228e
+  metadata.gz: b101283f4c71649578a073eac435ecfc727cff3e2cbfea45458e64566b5a42aa
+  data.tar.gz: a7ab59be3ca3ca945f52dbb374764c8e869bb724b7e5e8f27c5bf01380a7b708
 SHA512:
-  metadata.gz: 93c208b2978085d69009ed77471980b37488a51079c8013582e3a75f46820935965f009388eed5754c5bd496aacceda060c2e8b553f911b2848579c3323ce55c
-  data.tar.gz: 6738e1b4ee6b31fbe90ede296da1ee55eb0dd1f2205163aed267d0e4ead370ad7e0bc54550bda8b978f4f7f1d3ba63768487c2039af04b059022cf9511679237
+  metadata.gz: a44eef076664b96349d4da5d4178e997ba4cd838f11b54d85e000b21c5cdaa02a6543afc9d552c63f12752a55d6666a7b4c36d7c3e671da444908e16088b582a
+  data.tar.gz: 1f0d095dd7fe53c97b8d88b0ce80054f7b45c69fcd9abc109332c89b9299881191b0e94a889b0ce32cf86b7d7bed5359092b14bea3154d37ead7667403490ead

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,10 +38,17 @@ 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 = []
@@ -137,11 +144,13 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
           @logger.info("Log stream #{send_opts[:log_stream_name]} already exists")
         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
       end
     end
-  end # def multi_receive_encoded
+  end # def multi_receive_encodeds
 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.22'
+  s.version       = '0.1.27'
   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.22
+  version: 0.1.27
 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