sidekiq-datadog-monitor 0.0.0.4 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2de3d4b4ef9561d5c50b0c22712371f7e8f4e0907fa6da57295835bb1d735567
-  data.tar.gz: f3f0f3fa3989a278da0c289b1d10844a296e52d4dd46ddfe7e75550e2f67c350
+  metadata.gz: 6f39776d67b0d9e04bcba82941af3b959286238613a9caf3a5a4441bafab2be7
+  data.tar.gz: 7c09d4302aa6ba33fcb47594b0fd07258e8ac223d4f8b7ecc305e98f537b8d16
 SHA512:
-  metadata.gz: '09d3cd2512b3909196003dcbd948c462ca9f432d363be46b73693a4c77123ba0ade379574c6bd412522b62ecf1102c86cb39a22a88b18ba24561ffa174534eba'
-  data.tar.gz: b15eec55951ce0d0ad84a2644f3f9672a3553a353372cd5ab88bdf918095121149ebefd8b72ded98166ad135cbb0e0e1f344e59d645e65b90b0eabdb7402fb67
+  metadata.gz: 8ed5f31a56a46e1bb3296cc99025ea68c098c41528cba06c92e4892762ec86a4decfc9989cd30ea7a38d50a0666d53459b9cd25aad1109af676e4e1c9598c31b
+  data.tar.gz: ae0dfb2ded81b2b23a476b8269366d164d9aea9b3a8d1f021e6e449503b5346ebdec18901c276684e816197771c9db33b2cc11bef009685ae5c6dca57a1ff5c1

data/README.md

@@ -31,9 +31,8 @@ require 'sidekiq/datadog/monitor/data'
 Sidekiq::Datadog::Monitor::Data.initialize!(
     {agent_host: 'localhost', 
      agent_port: 8125,
-     env: 'production',    # optional
-     tag: 'tag',           # optional  
-     queue: 'queue name',  # optional
+     queue: 'queue name',
+     tags: ['env:production', 'product:product_name'], # optional
      cron: "*/30 * * * *" # default: "*/1 * * * *"
      } 
     )
@@ -41,7 +40,9 @@ Sidekiq::Datadog::Monitor::Data.initialize!(
 ```
 `agent_host` and `agent_port` instantiate DogStatsD client 
 
-`env`, `tag`, `queue` settings for background job that will gather and send Sidekiq metrics
+`queue` setting for background job that will gather and send Sidekiq metrics
+
+`tags` tags for datadog metrics
 
 `cron` - schedule settings for background job that will gather and send Sidekiq metrics
 

data/lib/sidekiq/datadog/monitor.rb

@@ -1,13 +1,11 @@
-require 'sidekiq/datadog/monitor/metrics_worker'
-require "sidekiq/datadog/monitor/version"
-require 'sidekiq-scheduler'
-require 'datadog/statsd'
 require 'sidekiq/api'
-require 'sidekiq'
+require 'sidekiq-scheduler'
+require 'sidekiq/datadog/monitor/data'
+require 'sidekiq/datadog/monitor/metrics_worker'
 
 module Sidekiq
   module Datadog
-    module Monitor 
+    module Monitor
       class Error < StandardError; end
     end
   end

data/lib/sidekiq/datadog/monitor/data.rb

@@ -1,34 +1,33 @@
-require "sidekiq/datadog/monitor"
-
 module Sidekiq
   module Datadog
     module Monitor
       class Data
         class << self
-          attr_reader :agent_port, :agent_host, :tag, :env, :queue, :cron
+          attr_reader :agent_port, :agent_host, :tags, :env, :queue, :cron
 
           def initialize!(options)
-            @agent_port, @agent_host = options.fetch_values(:agent_port, :agent_host)
-            @tag = options[:tag] || ''
-            @env = options[:env] || ''
-            @queue = options[:queue] || ''
-            @cron = options[:cron] || "*/1 * * * *"
-
-            start
+            @agent_port, @agent_host, @queue = options.fetch_values(:agent_port, :agent_host, :queue)
+            @tags = options[:tags] || []
+            @cron = options[:cron] || '*/1 * * * *'
 
-            SidekiqScheduler::Scheduler.instance.reload_schedule!
+            Sidekiq.configure_server do |config|
+              SidekiqScheduler::Scheduler.dynamic = true
 
+              config.on(:startup) do
+                start
+              end
+            end
           rescue StandardError => e
-            raise Sidekiq::Datadog::Monitor::Error.new(e.message)
+            raise Sidekiq::Datadog::Monitor::Error, e.message
           end
 
           private
 
           def start
-            Sidekiq.set_schedule('send_metrics', 
-              { "cron"=> cron, 'class' => 'Sidekiq::Datadog::Monitor::MetricsWorker', 'queue' => queue })
+            Sidekiq.set_schedule('send_metrics',
+                                 { 'cron' => cron, 'class' => 'Sidekiq::Datadog::Monitor::MetricsWorker', 'queue' => queue })
           end
-        end 
+        end
       end
     end
   end

data/lib/sidekiq/datadog/monitor/metrics_worker.rb

@@ -1,11 +1,14 @@
-require "sidekiq/datadog/monitor"
+require 'sidekiq/datadog/monitor/data'
+require 'datadog/statsd'
 
 module Sidekiq
   module Datadog
     module Monitor
       class MetricsWorker
         include Sidekiq::Worker
-        
+
+        sidekiq_options retry: false
+
         def perform
           Sidekiq::Stats.new.queues.each_pair do |queue_name, size|
             post_queue_size(queue_name, size)
@@ -22,13 +25,13 @@ module Sidekiq
 
         def post_queue_size(queue_name, size)
           statsd.gauge('sidekiq.queue.size', size,
-                      tags: ["queue_name:#{queue_name}", "env:#{Data.env}", Data.tag])
+                       tags: ["queue_name:#{queue_name}"].concat(Data.tags))
         end
 
         def post_queue_latency(queue_name)
           latency = Sidekiq::Queue.new(queue_name).latency
           statsd.gauge('sidekiq.queue.latency', latency,
-                      tags: ["queue_name:#{queue_name}", "env:#{Data.env}", Data.tag])
+                       tags: ["queue_name:#{queue_name}"].concat(Data.tags))
         end
       end
     end

data/lib/sidekiq/datadog/monitor/version.rb

@@ -1,7 +1,7 @@
 module Sidekiq
   module Datadog
     module Monitor
-      VERSION = "0.0.0.4"
+      VERSION = '0.1.3'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-datadog-monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.0.4
+  version: 0.1.3
 platform: ruby
 authors:
 - aleksa_castle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2020-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.85.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.38.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.38.1
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement