inst_statsd 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7eba72a497efc7967daa2dd99d270703bb6e513d34aa2a2c90b88ac7fe15ee6
-  data.tar.gz: ce9c3026304050075016db7fb959afdf2c574287b0e7ec6b0c2484db3e8429d7
+  metadata.gz: e4a37b143fb7348450535523a0a5f6d8f5b1817b26a71f65accd0f44f2b6c020
+  data.tar.gz: 4ec4d4b5b82305d3d6604fc4a1824b07ede89fb2da5d52f444f28dc4eb483f91
 SHA512:
-  metadata.gz: 64aaa60431ec40f7cf7296778c96744438f76129ca7737683b5a5d8528d0b06d8e2a6a092e3dfefee13696fd0968dfa894016b3cdd947cf26f4134c090655413
-  data.tar.gz: ac9f462c401b1162924c769c0189bf5676eb5eede8d668233468b27e375fae65c5e466110cd8a869d92edef2eef46701854edd29ef7474c1778f4a15b81b219a
+  metadata.gz: 0b5fd970e6f6424c4065bf6baaf64bcd77d1d5211f2f8c6a990377f2534f9272e28a293279a58f726e40c95df2918c61fbda43dc260a7db93f610d021b2d190c
+  data.tar.gz: 93448febe5f6cb62d05fad68978dbe597503b0724f65f3f48618a6ca74808860c19a5fc11d8d823d788b6fc870257517b770463c0b2ac7470fe398d6fc926960

data/lib/inst_statsd.rb

@@ -42,12 +42,13 @@ module InstStatsd
     end
 
     def env_settings(env = ENV)
+      dog_tags = JSON.load(env['INST_DOG_TAGS']).to_h if env['INST_DOG_TAGS']
       config = {
         host: env.fetch('INST_STATSD_HOST', nil),
         port: env.fetch('INST_STATSD_PORT', nil),
         namespace: env.fetch('INST_STATSD_NAMESPACE', nil),
         append_hostname: env.fetch('INST_STATSD_APPEND_HOSTNAME', nil),
-        dog_tags: env.fetch('INST_DOG_TAGS', nil)
+        dog_tags: dog_tags
       }
       config.delete_if { |_k, v| v.nil? }
       convert_bool(config, :append_hostname)

data/lib/inst_statsd/statsd.rb

@@ -58,7 +58,10 @@ module InstStatsd
             tags = convert_tags(tags)
             tags << 'host:' unless self.append_hostname?
             short_stat ||= stat_name
-            self.instance.#{method}(short_stat, *args, tags: tags)
+            opts = { tags: tags }
+            opts[:sample_rate] = args.pop if args.length == 2
+            args << opts
+            self.instance.#{method}(short_stat, *args)
           else
             self.instance.#{method}(stat_name, *args)
           end
@@ -108,8 +111,9 @@ module InstStatsd
           @data_dog = true
           host = statsd_settings[:host] || 'localhost'
           port = statsd_settings[:port] || 8125
+          require 'datadog/statsd'
           @statsd = ::Datadog::Statsd.new(host, port)
-          @statsd.dog_tags = statsd_settings[:dog_tags] || {}
+          self.dog_tags.replace(statsd_settings[:dog_tags] || {})
           @append_hostname = !statsd_settings.key?(:append_hostname) || !!statsd_settings[:append_hostname]
         elsif statsd_settings && statsd_settings[:host]
           @statsd = ::Statsd.new(statsd_settings[:host])

data/spec/inst_statsd/inst_statsd_spec.rb

@@ -121,10 +121,10 @@ describe InstStatsd do
 
     it 'builds settings hash with dog environment vars' do
       env = {
-        'INST_DOG_TAGS' => {app: 'canvas', env: 'prod'},
+        'INST_DOG_TAGS' => '{"app": "canvas", "env": "prod"}',
       }
       expected = {
-        dog_tags: {app: 'canvas', env: 'prod'},
+        dog_tags: {"app" => "canvas", "env" => "prod"},
       }
       expect(InstStatsd.env_settings(env)).to eq(expected)
     end

data/spec/inst_statsd/statsd_spec.rb

@@ -24,8 +24,11 @@ describe InstStatsd::Statsd do
   it 'sending tags should not break statsd' do
     default_tags = {app: 'canvas', env: 'prod'}
     short_stat = 'test2'
+    env = {
+      'INST_DOG_TAGS' => '{"app": "canvas", "env": "prod"}',
+    }
+    InstStatsd.env_settings(env)
     allow(InstStatsd::Statsd).to receive(:hostname).and_return('testhost')
-    allow(InstStatsd::Statsd).to receive(:dog_tags).and_return(default_tags)
     allow(InstStatsd::Statsd).to receive(:short_stat).and_return(short_stat)
     statsd = double
     allow(InstStatsd::Statsd).to receive(:instance).and_return(statsd)
@@ -53,7 +56,7 @@ describe InstStatsd::Statsd do
       expect(statsd).to receive(method).with(short_stat, 'test', tags: converted_tags)
       InstStatsd::Statsd.send(method, 'test.name', 'test', short_stat: short_stat)
     end
-    expect(statsd).to receive('timing').with(short_stat, anything, anything, tags: converted_tags)
+    expect(statsd).to receive('timing').with(short_stat, anything, sample_rate: anything, tags: converted_tags)
     expect(InstStatsd::Statsd.time('test.name', short_stat: short_stat) {'test'}).to eq 'test'
   end
 
@@ -69,7 +72,7 @@ describe InstStatsd::Statsd do
       expect(statsd).to receive(method).with('test.name', 'test', tags: converted_tags)
       InstStatsd::Statsd.send(method, 'test.name', 'test')
     end
-    expect(statsd).to receive('timing').with('test.name', anything, anything, tags: converted_tags)
+    expect(statsd).to receive('timing').with('test.name', anything, sample_rate: anything, tags: converted_tags)
     expect(InstStatsd::Statsd.time('test.name') {'test'}).to eq 'test'
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst_statsd
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Nick Cloward