logstash-output-cloudwatch 3.0.9 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0f13e66264de035c9956429f9a1d78958ed62759750f5fa3ccfad527eb9b7bd
-  data.tar.gz: 81cecb4ef489b26388b0179fc570609aa931b5d3020caf84cf731029c5c57e5a
+  metadata.gz: 8aa68c4678a209eeeab4d6e43e7f0c6e7e10de5525efc2c87d771fef4ecf053e
+  data.tar.gz: 67484c33232c78a5d4ac335011dbad19377d83ab0745934daf8da185fed40c6d
 SHA512:
-  metadata.gz: 0fddc6d522c0f97d89d3c57218d495527803f5a223bf49df281476b3f008902c770369fd4d6cef4cf59c5e80a3a33e1a4e5361baf246f0253243560f4de99a46
-  data.tar.gz: 3dd51d37427a735aea859d4ca0e5f6f256bdb00078e72707ac6acd0eb7b01d4bb03538a7c679d58133269c0e616c08bc75508dd8c4019290932ffdef5296e8fc
+  metadata.gz: af131f72bc576f1c65a43396b93b9a3847a211fecffdf0d2299d97070c4593ad8c453d3577048af3ca75d1447416f14c632a3fe075a3cd83b5e4d601fccf59ef
+  data.tar.gz: 7a9d5b73e391150d1eac342a75e6398d520acf311775fd7aab6bbd6a45e042e05c416cd70c3c011f0380d588ef17e2bbb18a31787efe539d68388c2fb9ff97f9

data/CHANGELOG.md

@@ -1,5 +1,9 @@
+## 3.0.10
+  - Deps: unpin rufus scheduler [#20](https://github.com/logstash-plugins/logstash-output-cloudwatch/pull/20)
+  - Fix: an old undefined method error which would surface with load (as queue fills up) 
+
 ## 3.0.9
-- Fix: dropped usage of SHUTDOWN event deprecated since Logstash 5.0 [#18](https://github.com/logstash-plugins/logstash-output-cloudwatch/pull/18)
+  - Fix: dropped usage of SHUTDOWN event deprecated since Logstash 5.0 [#18](https://github.com/logstash-plugins/logstash-output-cloudwatch/pull/18)
 
 ## 3.0.8
   - Docs: Set the default_codec doc attribute.

data/lib/logstash/outputs/cloudwatch.rb

@@ -3,6 +3,8 @@ require "logstash/outputs/base"
 require "logstash/namespace"
 require "logstash/plugin_mixins/aws_config"
 
+require "rufus/scheduler"
+
 # This output lets you aggregate and send metric data to AWS CloudWatch
 #
 # ==== Summary:
@@ -154,28 +156,34 @@ class LogStash::Outputs::CloudWatch < LogStash::Outputs::Base
   #     `add_field => [ "CW_dimensions", "prod" ]`
   config :field_dimensions, :validate => :string, :default => "CW_dimensions"
 
+  attr_reader :event_queue
+
   public
   def register
     require "thread"
-    require "rufus/scheduler"
     require "aws-sdk"
 
     @cw = Aws::CloudWatch::Client.new(aws_options_hash)
 
     @event_queue = SizedQueue.new(@queue_size)
     @scheduler = Rufus::Scheduler.new
-    @job = @scheduler.every @timeframe do
+    @job = @scheduler.schedule_every @timeframe do
       @logger.debug("Scheduler Activated")
       publish(aggregate({}))
     end
   end # def register
 
+  # Rufus::Scheduler >= 3.4 moved the Time impl into a gem EoTime = ::EtOrbi::EoTime`
+  # Rufus::Scheduler 3.1 - 3.3 using it's own Time impl `Rufus::Scheduler::ZoTime`
+  RufusTimeImpl = defined?(Rufus::Scheduler::EoTime) ? Rufus::Scheduler::EoTime :
+                      (defined?(Rufus::Scheduler::ZoTime) ? Rufus::Scheduler::ZoTime : ::Time)
+
   public
   def receive(event)
     return unless (event.get(@field_metricname) || @metricname)
 
     if (@event_queue.length >= @event_queue.max)
-      @job.trigger
+      @job.trigger RufusTimeImpl.now
       @logger.warn("Posted to AWS CloudWatch ahead of schedule.  If you see this often, consider increasing the cloudwatch queue_size option.")
     end
 

data/logstash-output-cloudwatch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-cloudwatch'
-  s.version         = '3.0.9'
+  s.version         = '3.0.10'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Aggregates and sends metric data to AWS CloudWatch"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
   s.add_runtime_dependency 'logstash-mixin-aws', '>= 1.0.0'
-  s.add_runtime_dependency 'rufus-scheduler', [ '~> 3.0.9' ]
+  s.add_runtime_dependency 'rufus-scheduler', '>= 3.0.9'
 
   s.add_development_dependency 'logstash-devutils'
 end

data/spec/outputs/cloudwatch_spec.rb

@@ -1,18 +1,38 @@
 require "logstash/devutils/rspec/spec_helper"
-require "logstash/plugin"
-require "logstash/json"
+require "logstash/outputs/cloudwatch"
 
 describe "outputs/cloudwatch" do
   
+  let(:config) { { 'metricname' => 'foo' } }
 
-  output = LogStash::Plugin.lookup("output", "cloudwatch").new
+  subject(:plugin) { LogStash::Outputs::CloudWatch.new(config) }
 
   it "should register" do
-    expect {output.register}.to_not raise_error
+    expect { plugin.register }.to_not raise_error
   end
 
   it "should respond correctly to a receive call" do
+    plugin.register
     event = LogStash::Event.new
-    expect { output.receive(event) }.to_not raise_error
+    expect { plugin.receive(event) }.to_not raise_error
+  end
+
+  context 'with queue_size' do
+
+    let(:queue_size) { 100 }
+
+    let(:config) { super().merge('queue_size' => queue_size) }
+
+    it "triggers job ahead of time" do
+      plugin.register
+      event_queue = plugin.event_queue
+      allow( event_queue ).to receive(:length).and_return queue_size # emulate full queue
+      expect( plugin ).to receive(:publish)
+
+      event = LogStash::Event.new
+      plugin.receive(event)
+      sleep 1.0 # allow scheduler to kick in
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-cloudwatch
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.10
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -47,7 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.9
   name: rufus-scheduler
@@ -55,7 +55,7 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.9
 - !ruby/object:Gem::Dependency
@@ -111,8 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Aggregates and sends metric data to AWS CloudWatch