logstash-output-awslogs 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd6de218003a805ad230d143147375621fbf7bbf803a7739582bf39da44dc228
-  data.tar.gz: 19a12a32d0a38df507e498783b046f329f727727bef51e770398afaeb1e7f9d8
+  metadata.gz: 5d89bf2683352b8d8e1dfb360760e5129db4d0bcfb447bea11101c3dc7648b11
+  data.tar.gz: 64e3749306d9da99ff81ca006bfb2e7c34255981b75119ee238d00b149e379f9
 SHA512:
-  metadata.gz: 789581c0eff8aaf841a805ffd054733e30cc910897bafc2d245e2cb26ae891e9893ce0e836c709c419c874d5187603a0db6ca7dca96f5236be702f00b02f3e0a
-  data.tar.gz: f7531d29688b185862a9e4af27bf796ffa21c638d1423fbaa14b9fb24291eaac89bf08239f2109cfea7fe7edfc1ab3b53b769f866f2635a652d8347ca204b197
+  metadata.gz: fc23ff3640ec9526027a3a1de59329dc00fedf2722602eca9e71ac4081007ad029e38391fe40a9895821aecd3e0f938c7f4f92c9f3139bee3a6410a640e8fffc
+  data.tar.gz: ce9e61a5e8d17bdb8aaa3a61bce0d7510f7547bc01327579263a9494cf110a8646d271d11b087bf915f035aa0de107f1a35eaa798f36306a546b9648ced32427

data/lib/logstash/outputs/awslogs.rb

@@ -4,6 +4,7 @@ require 'logstash/outputs/base'
 require 'logstash/namespace'
 require 'logstash/plugin_mixins/aws_config'
 require 'aws-sdk-cloudwatchlogs'
+require 'time'
 
 
 class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
@@ -15,6 +16,7 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
 
   PER_EVENT_OVERHEAD = 26
   MAX_BATCH_SIZE = 1024 * 1024
+  MIN_DELAY = 0.2
 
   # Log group to send event to
   config :log_group_name, validate: :string, required: true
@@ -26,6 +28,7 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
   public
   def register
     @client = Aws::CloudWatchLogs::Client.new(aws_options_hash)
+    @last_flush = Time.now.to_f
   end # def register
 
   public
@@ -39,6 +42,8 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
   private
   def put_events(batch)
     begin
+      delay = MIN_DELAY - (Time.now.to_f - @last_flush)
+      sleep(delay) if delay > 0
       @client.put_log_events(
         {
           log_group_name: batch[:log_group],
@@ -60,16 +65,17 @@ class LogStash::Outputs::Awslogs < LogStash::Outputs::Base
       end
       retry
     end
+    rescue Aws::CloudWatchLogs::Errors::LimitExceededException
+      @logger.info("AWSLogs: Rate limit exceeded, retrying")
+      retry
+    end
+    @last_flush = Time.now.to_f
   end
 
   private
   def form_event_batches(events_arr)
     batches = []
     events_by_stream_and_group = {}
-    # events_by_stream_and_group = {
-    # ['group','stream'] => [{timestamp => 1, message => "message1"},{timestamp => 2, message => "mesage2"}],
-    # ['group2','stream2'] => [{timestamp => 3, message => "message3"},{timestamp => 4, message => "message4"}]
-    # }
     log_events = events_arr.sort_by { |event| event.timestamp.time.to_f}
     log_events.each do |event|
       event_log_stream_name = event.sprintf(log_stream_name)

data/logstash-output-awslogs.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-awslogs'
-  s.version       = '1.1.3'
+  s.version       = '1.1.4'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Writes events to AWS CloudWatch logs.'
   s.homepage      = 'https://github.com/Anarhyst266/logstash-output-awslogs'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-awslogs
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Anton Klyba
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-23 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement