canvas_statsd 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8d208dec2b9d9e15929242060b633ddc26604e4
-  data.tar.gz: 64dd9bbc70f94f50e825f956fb5d8487aa7d70ac
+  metadata.gz: f11b331df3323ea17bbd53e1fe4e1a2cdc85a411
+  data.tar.gz: 6391cae54d956383130fdf3e87eebcc7a2bcd54c
 SHA512:
-  metadata.gz: 9cc72278306b28823f791c6caa32788f62f9462146269ce6b9bbcf448b00bb5215bc4178955638fa217b031a8c2a1e600be96535f0020c0d2d7f909434c07cb2
-  data.tar.gz: c43c0b295a7181af427f02710b269060afe83860df65df94e3e4bbffacd97d4b3983dc022ab4b07cc07dfaf63e5b3c8007ca31cb98d4e12384145ce5cbfe827e
+  metadata.gz: 38b7ea0aa3b030ba275f5e3f28c0785127f768154c705c93372e0dd98de78b9f4d2ef7639d5fe2b0de40bdac41d10622c30890e81abb71744eb1b9bad1978d96
+  data.tar.gz: fa3a29befc27f44e1a3f090dede8320446e0e8bd96dec6efc7a27cbe164bb47c768bc50b2071569940e97c9f74eba8ee5ae196de2631765315723db4761cf0a7

data/lib/canvas_statsd.rb

@@ -1,7 +1,7 @@
 require 'statsd'
 
 module CanvasStatsd
-  VALID_SETTINGS = [:host, :port, :namespace, :append_hostname]
+  VALID_SETTINGS = [:host, :port, :namespace, :append_hostname, :mask, :negative_mask]
 
   class ConfigurationError < StandardError; end
 
@@ -18,7 +18,7 @@ module CanvasStatsd
 
   class << self
     def settings
-      @settings || env_settings
+      @settings ||= env_settings
     end
   
     def settings=(value)
@@ -33,6 +33,7 @@ module CanvasStatsd
         if !VALID_SETTINGS.include?(k.to_sym)
           raise CanvasStatsd::ConfigurationError, "Invalid key: #{k}"
         end
+        v = Regexp.new(v) if [:mask, :negative_mask].include?(k.to_sym) && v.is_a?(String)
         validated[k.to_sym] = v
       end
   

data/lib/canvas_statsd/block_tracking.rb

@@ -5,7 +5,22 @@ module CanvasStatsd
     class << self
       attr_accessor :logger
 
+      [:mask, :negative_mask].each do |method|
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{method}
+            CanvasStatsd.settings[:#{method}]
+          end
+
+          def #{method}=(value)
+            CanvasStatsd.settings[:#{method}] = value
+          end
+        RUBY
+      end
+
       def track(key, category: nil, statsd: CanvasStatsd::Statsd, only: nil)
+        return yield if mask && mask !~ key
+        return yield if negative_mask && negative_mask =~ key
+
         cookies = if only
                     Array(only).map { |name| [name, Counter.counters[name].start] }
                   else

data/spec/canvas_statsd/block_tracking_spec.rb

@@ -42,4 +42,37 @@ describe CanvasStatsd::BlockTracking do
       end
     end
   end
+
+  context "mask" do
+    after do
+      CanvasStatsd::BlockTracking.mask = nil
+      CanvasStatsd::BlockTracking.negative_mask = nil
+    end
+
+    it "only tracks keys that match the mask" do
+      CanvasStatsd::BlockTracking.mask = /mykey/
+      statsd = double()
+      allow(statsd).to receive(:timing).with('mykey.total', anything)
+      expect(statsd).to receive(:timing).with("mykey.sql.read", 1)
+
+      CanvasStatsd::BlockTracking.track("mykey", statsd: statsd, only: 'sql.read') do
+        CanvasStatsd::BlockTracking.track("ignoreme", statsd: statsd, only: 'sql.read') do
+          ActiveSupport::Notifications.instrument('sql.active_record', name: "LOAD", sql: "SELECT * FROM users") {}
+        end
+      end
+    end
+
+    it "doesn't track keys that match the negative mask" do
+      CanvasStatsd::BlockTracking.negative_mask = /ignoreme/
+      statsd = double()
+      allow(statsd).to receive(:timing).with('mykey.total', anything)
+      expect(statsd).to receive(:timing).with("mykey.sql.read", 1)
+
+      CanvasStatsd::BlockTracking.track("mykey", statsd: statsd, only: 'sql.read') do
+        CanvasStatsd::BlockTracking.track("ignoreme", statsd: statsd, only: 'sql.read') do
+          ActiveSupport::Notifications.instrument('sql.active_record', name: "LOAD", sql: "SELECT * FROM users") {}
+        end
+      end
+    end
+  end
 end

metadata

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