canvas_statsd 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2c54cdb899ff21986ae486d9267df47635acf60
-  data.tar.gz: 4d5c68e5e2d059c4aeb68e4776166d7871bb2c5e
+  metadata.gz: b8d208dec2b9d9e15929242060b633ddc26604e4
+  data.tar.gz: 64dd9bbc70f94f50e825f956fb5d8487aa7d70ac
 SHA512:
-  metadata.gz: 2a70d652c80696b6bf79814fd0e64ad4fdd442792a902f088b7847297159cde5a03de20b50ce071ab5a6feb24ff5bc430e4ef36f1dc36fa6c6eab99b5b42b4dd
-  data.tar.gz: 03f015d44447c96b8b107db4a756c05cf83a53df5258e9e6350d09020dff12cc2fb24010b58d80ee1263a4bafd75ca341d2dd0565d801a6176057abe870cb586
+  metadata.gz: 9cc72278306b28823f791c6caa32788f62f9462146269ce6b9bbcf448b00bb5215bc4178955638fa217b031a8c2a1e600be96535f0020c0d2d7f909434c07cb2
+  data.tar.gz: c43c0b295a7181af427f02710b269060afe83860df65df94e3e4bbffacd97d4b3983dc022ab4b07cc07dfaf63e5b3c8007ca31cb98d4e12384145ce5cbfe827e

data/lib/canvas_statsd/statsd.rb

@@ -77,7 +77,20 @@ module CanvasStatsd
       result
     end
 
+    def self.batch
+      return yield unless (old_instance = instance)
+      old_instance.batch do |batch|
+        Thread.current[:canvas_statsd] = batch
+        yield
+      end
+    ensure
+      Thread.current[:canvas_statsd] = old_instance
+    end
+
     def self.instance
+      thread_statsd = Thread.current[:canvas_statsd]
+      return thread_statsd if thread_statsd
+
       if !defined?(@statsd)
         statsd_settings = CanvasStatsd.settings
 
@@ -85,6 +98,7 @@ module CanvasStatsd
           @statsd = ::Statsd.new(statsd_settings[:host])
           @statsd.port = statsd_settings[:port] if statsd_settings[:port]
           @statsd.namespace = statsd_settings[:namespace] if statsd_settings[:namespace]
+          @statsd.batch_size = statsd_settings[:batch_size] if statsd_settings[:batch_size]
           @append_hostname = !statsd_settings.key?(:append_hostname) || !!statsd_settings[:append_hostname]
         else
           @statsd = nil
@@ -99,6 +113,7 @@ module CanvasStatsd
 
     def self.reset_instance
       remove_instance_variable(:@statsd) if defined?(@statsd)
+      Thread.current[:canvas_statsd] = nil
     end
   end
 end

data/spec/canvas_statsd/statsd_spec.rb

@@ -73,6 +73,27 @@ describe CanvasStatsd::Statsd do
     expect(instance.namespace).to eq "test"
   end
 
+  describe ".batch" do
+    it "is properly reentrant" do
+      CanvasStatsd.settings = { :host => "localhost", :namespace => "test", :port => 1234 }
+      CanvasStatsd::Statsd.reset_instance
+
+      statsd = CanvasStatsd::Statsd.instance
+      CanvasStatsd::Statsd.batch do
+        batch1 = CanvasStatsd::Statsd.instance
+        CanvasStatsd::Statsd.batch do
+          batch2 = CanvasStatsd::Statsd.instance
+          expect(statsd).to be_a ::Statsd
+          expect(batch1).to be_a ::Statsd::Batch
+          expect(batch2).to be_a ::Statsd::Batch
+          expect(batch1).not_to eq batch2
+        end
+        expect(CanvasStatsd::Statsd.instance).to eq batch1
+      end
+      expect(CanvasStatsd::Statsd.instance).to eq statsd
+    end
+  end
+
   describe ".escape" do
     it "replaces any dots in str with a _ when no replacment given" do
       result = CanvasStatsd::Statsd.escape("lots.of.dots")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_statsd
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Nick Cloward
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statsd-ruby