logstash-output-cloudwatch 3.0.10 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aa68c4678a209eeeab4d6e43e7f0c6e7e10de5525efc2c87d771fef4ecf053e
-  data.tar.gz: 67484c33232c78a5d4ac335011dbad19377d83ab0745934daf8da185fed40c6d
+  metadata.gz: 481a88fcce877164a1509394ea7b544ae0a91a987994cd83c9077708f38d2e23
+  data.tar.gz: af740d8bbe2c0d2a68121fd2ea01656cc85e1dac925febcbf2cdea2b04b573ac
 SHA512:
-  metadata.gz: af131f72bc576f1c65a43396b93b9a3847a211fecffdf0d2299d97070c4593ad8c453d3577048af3ca75d1447416f14c632a3fe075a3cd83b5e4d601fccf59ef
-  data.tar.gz: 7a9d5b73e391150d1eac342a75e6398d520acf311775fd7aab6bbd6a45e042e05c416cd70c3c011f0380d588ef17e2bbb18a31787efe539d68388c2fb9ff97f9
+  metadata.gz: 70e7b7b78a0ec49a2b47de1c61226b9302f2798e742f9b68a95d6802a43285169251be6169e655ef253c824d5fb1aa0fe6fe194ac40c5375b70161aabd3db1f8
+  data.tar.gz: cd20f4ead9f8d4e1d224d96a766fa3194e8b9a85de175761950c4e3f59afed38c00156669b437adc87cd6caf27e11bc20e432753768786df34864b62e4a46ca2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.1.0
+  - Refactor: switch to using the scheduler mixin [#22](https://github.com/logstash-plugins/logstash-output-cloudwatch/pull/22)
+
 ## 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) 

data/lib/logstash/outputs/cloudwatch.rb

@@ -2,8 +2,7 @@
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "logstash/plugin_mixins/aws_config"
-
-require "rufus/scheduler"
+require "logstash/plugin_mixins/scheduler"
 
 # This output lets you aggregate and send metric data to AWS CloudWatch
 #
@@ -64,6 +63,7 @@ require "rufus/scheduler"
 # http://docs.amazonwebservices.com/AmazonCloudWatch/latest/APIReference/API_PutMetricData.html[PutMetricData]
 class LogStash::Outputs::CloudWatch < LogStash::Outputs::Base
   include LogStash::PluginMixins::AwsConfig::V2
+  include LogStash::PluginMixins::Scheduler
   
   config_name "cloudwatch"
 
@@ -166,28 +166,25 @@ class LogStash::Outputs::CloudWatch < LogStash::Outputs::Base
     @cw = Aws::CloudWatch::Client.new(aws_options_hash)
 
     @event_queue = SizedQueue.new(@queue_size)
-    @scheduler = Rufus::Scheduler.new
-    @job = @scheduler.schedule_every @timeframe do
-      @logger.debug("Scheduler Activated")
-      publish(aggregate({}))
-    end
+
+    @job = scheduler.every(@timeframe) { do_publish }
   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)
+  def do_publish
+    publish(aggregate({}))
+  end
+  private :do_publish
 
   public
   def receive(event)
     return unless (event.get(@field_metricname) || @metricname)
 
     if (@event_queue.length >= @event_queue.max)
-      @job.trigger RufusTimeImpl.now
+      do_publish
       @logger.warn("Posted to AWS CloudWatch ahead of schedule.  If you see this often, consider increasing the cloudwatch queue_size option.")
     end
 
-    @logger.debug("Queueing event", :event => event)
+    @logger.debug? && @logger.debug("Queueing event", :event => event.to_hash)
     @event_queue << event
   end # def receive
 

data/logstash-output-cloudwatch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-cloudwatch'
-  s.version         = '3.0.10'
+  s.version         = '3.1.0'
   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 "logstash-mixin-scheduler", '~> 1.0'
 
   s.add_development_dependency 'logstash-devutils'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-cloudwatch
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.1.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -47,17 +47,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.9
-  name: rufus-scheduler
+        version: '1.0'
+  name: logstash-mixin-scheduler
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: