sidekiq-datadog 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 434adf81e26d369fe73a8ade746e621987c91cdf
-  data.tar.gz: 3555d4a780a1d8655aeafae3f90fe29f7da3b601
+SHA256:
+  metadata.gz: 5f4d345b0e6b984519eca3a6e088f387649fc5bbc46d414fc3ed0165f8ca9db7
+  data.tar.gz: 0d9b85a785bea3e9ca60d2a62604c90eef649754a0f6377e32aa115eb0a0eb95
 SHA512:
-  metadata.gz: 2ad97b9312251b01a17c5da6b1dc05922767f5197f4dde69b3c5c9c3c63a0f5a4b228cb2b6e12e0301524d490005ae7571ccadead8cc807a228bb0e5b57ed0a7
-  data.tar.gz: a443d277c1e0ee3ea8789bf60ae0bf083cc93b4867351de2b80e4bdecaeff8455d35424eda17b03de51e2d204e926566c07e51d4832aec7993978e4231206201
+  metadata.gz: 5da1867bec33ef19c61ac30efe3f37aef687f77c509a1859d69028fbeade3f49ae4543604bbf21a6c16a2ed980f0f025dbc31f7f09f37119b8a39f554e1b4cfa
+  data.tar.gz: 62cff0b0830b3a3caba520257827524fc49f59f307abfb5476d67b96911bb96db3db21d6fbdeccef2586b7f10c7e2bd1925f76601ae85cf872ac1af197cb18c8

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
-sudo: false
 cache: bundler
 rvm:
-  - 2.3.1
-  - 2.2.5
+  - 2.5.1
+  - 2.4.4

data/Gemfile.lock

@@ -1,40 +1,40 @@
 PATH
   remote: .
   specs:
-    sidekiq-datadog (0.3.5)
-      dogstatsd-ruby (>= 2.0.0)
+    sidekiq-datadog (0.4.0)
+      dogstatsd-ruby (>= 3.3.0)
       sidekiq
 
 GEM
   remote: https://rubygems.org/
   specs:
     concurrent-ruby (1.0.5)
-    connection_pool (2.2.1)
+    connection_pool (2.2.2)
     diff-lcs (1.3)
-    dogstatsd-ruby (2.2.0)
-    rack (2.0.1)
-    rack-protection (1.5.3)
+    dogstatsd-ruby (3.3.0)
+    rack (2.0.5)
+    rack-protection (2.0.3)
       rack
-    rake (12.0.0)
-    redis (3.3.3)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rake (12.3.1)
+    redis (4.0.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    sidekiq (4.2.10)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    sidekiq (5.1.3)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
+      redis (>= 3.3.5, < 5)
 
 PLATFORMS
   ruby
@@ -46,4 +46,4 @@ DEPENDENCIES
   sidekiq-datadog!
 
 BUNDLED WITH
-   1.14.6
+   1.16.2

data/README.md

@@ -21,7 +21,45 @@ Configure it in an initializer:
       end
     end
 
-For full configuration options, please see the [Documentation](http://www.rubydoc.info/gems/sidekiq-datadog).
+## Options
+
+Options can be configured to be passed to the middleware constructor when it is added to the
+chain
+
+    Sidekiq.configure_server do |config|
+      config.server_middleware do |chain|
+        chain.add(Sidekiq::Middleware::Server::Datadog, statsd_port: 3334)
+      end
+    end
+
+Custom tags can be configured using the `tags:` property
+
+    Sidekiq.configure_server do |config|
+      config.server_middleware do |chain|
+        chain.add(Sidekiq::Middleware::Server::Datadog, tags: ['runtime:jruby'])
+      end
+    end
+
+Dynamic tags can be configured by passing a lambda in the tags array. It is
+executed at runtime when the job is processed
+
+    Sidekiq.configure_server do |config|
+      config.server_middleware do |chain|
+        chain.add(Sidekiq::Middleware::Server::Datadog, tags: [->(worker, job, queue, error){
+          "source:#{job['source']}"
+        }])
+      end
+    end
+
+#### supported options
+ - *hostname* - the hostname used for instrumentation, defaults to system hostname. Can also be set with the `INSTRUMENTATION_HOSTNAME` env var.
+ - *metric_name* - the metric name (prefix) to use, defaults to "sidekiq.job".
+ - *tags* - array of custom tags. These can be plain strings or lambda blocks
+ - *statsd_host* - the statsD host, defaults to "localhost". Can also be set with the `STATSD_HOST` env var
+ - *statsd_port* - the statsD port, defaults to 8125. Can also be set with the `STATSD_PORT` env var
+ - *statsd* - custom statsd instance
+
+For more detailed configuration options, please see the [Documentation](http://www.rubydoc.info/gems/sidekiq-datadog).
 
 ## Contributing
 

data/lib/sidekiq/datadog/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Datadog
-    VERSION = "0.3.5"
+    VERSION = "0.4.0"
   end
 end

data/sidekiq-datadog.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency(%q<sidekiq>)
-  s.add_runtime_dependency(%q<dogstatsd-ruby>, ">= 2.0.0")
+  s.add_runtime_dependency(%q<dogstatsd-ruby>, ">= 3.3.0")
 
   s.add_development_dependency(%q<rake>)
   s.add_development_dependency(%q<bundler>)

data/spec/sidekiq/middleware/server/datadog_spec.rb

@@ -5,12 +5,12 @@ describe Sidekiq::Middleware::Server::Datadog do
   let(:statsd) { Mock::Statsd.new(nil, nil, {}, 10000) }
   let(:worker) { Mock::Worker.new }
 
-  before  { statsd.buffer.clear }
+  before  { statsd.written.clear }
   subject { described_class.new hostname: "test.host", statsd: statsd, tags: ["custom:tag", lambda{|w, *| "worker:#{w.class.name[1..2]}" }] }
 
   it 'should send an increment and timing event for each job run' do
     subject.call(worker, { 'enqueued_at' => 1461881794.9312189 }, 'default') { "ok" }
-    expect(statsd.buffer).to eq([
+    expect(statsd.written).to eq([
       "sidekiq.job:1|c|#custom:tag,worker:oc,host:test.host,env:test,name:mock/worker,queue:default,status:ok",
       "sidekiq.job.time:333|ms|#custom:tag,worker:oc,host:test.host,env:test,name:mock/worker,queue:default,status:ok",
       "sidekiq.job.queued_time:333|ms|#custom:tag,worker:oc,host:test.host,env:test,name:mock/worker,queue:default,status:ok",
@@ -19,7 +19,7 @@ describe Sidekiq::Middleware::Server::Datadog do
 
   it 'should support wrappers' do
     subject.call(worker, { 'enqueued_at' => 1461881794.9312189, 'wrapped' => 'wrap'}, nil) { "ok" }
-    expect(statsd.buffer).to eq([
+    expect(statsd.written).to eq([
       "sidekiq.job:1|c|#custom:tag,worker:oc,host:test.host,env:test,name:wrap,status:ok",
       "sidekiq.job.time:333|ms|#custom:tag,worker:oc,host:test.host,env:test,name:wrap,status:ok",
       "sidekiq.job.queued_time:333|ms|#custom:tag,worker:oc,host:test.host,env:test,name:wrap,status:ok",
@@ -31,7 +31,7 @@ describe Sidekiq::Middleware::Server::Datadog do
       subject.call(worker, {}, nil) {  raise RuntimeError, "doh!" }
     }).to raise_error("doh!")
 
-    expect(statsd.buffer).to eq([
+    expect(statsd.written).to eq([
       "sidekiq.job:1|c|#custom:tag,worker:oc,host:test.host,env:test,name:mock/worker,status:error,error:runtime",
       "sidekiq.job.time:333|ms|#custom:tag,worker:oc,host:test.host,env:test,name:mock/worker,status:error,error:runtime",
     ])

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ module Mock
 
   class Statsd < ::Datadog::Statsd
     def timing(stat, ms, opts={}); super(stat, 333, opts); end
-    def flush_buffer; end
-    alias :send_stat :send_to_buffer
+    def send_to_socket(message); written.push(message); end
+    def written; @written ||= []; end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-datadog
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2018-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Datadog metrics for sidekiq