canvas_statsd 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 951dbaa395f7d79e76329d841ca6ce9aa8716a07
-  data.tar.gz: 2b9f6679bc1dd954fbe53ddf22fe43febde61380
+  metadata.gz: b2c54cdb899ff21986ae486d9267df47635acf60
+  data.tar.gz: 4d5c68e5e2d059c4aeb68e4776166d7871bb2c5e
 SHA512:
-  metadata.gz: 9465805cde29e5584b03fd173fb1b9d08cd21892413c6e1c8a06daa5a6295b45ea32ef8acdcab8a05bb967e8f385b9013e8e98b54dcb9a1922f9d849f6734b8d
-  data.tar.gz: a2c901c2764ff4a5690a6704a0f68c28da6ea13f97b52a5237caaeb3c15ff38fa9d05509fb1a345bce2a0dfc278af3104f64b39d81e91eb0ddd828bcd09abdba
+  metadata.gz: 2a70d652c80696b6bf79814fd0e64ad4fdd442792a902f088b7847297159cde5a03de20b50ce071ab5a6feb24ff5bc430e4ef36f1dc36fa6c6eab99b5b42b4dd
+  data.tar.gz: 03f015d44447c96b8b107db4a756c05cf83a53df5258e9e6350d09020dff12cc2fb24010b58d80ee1263a4bafd75ca341d2dd0565d801a6176057abe870cb586

data/lib/canvas_statsd/block_tracking.rb

@@ -32,7 +32,7 @@ module CanvasStatsd
 
         result
       ensure
-        stack(category).pop if category && stack(category) == block_stat
+        stack(category).pop if category && stack(category).last == block_stat
       end
 
       private

data/spec/canvas_statsd/block_tracking_spec.rb

@@ -21,7 +21,11 @@ describe CanvasStatsd::BlockTracking do
     expect(statsd).to receive(:timing).with('mykey.total', anything).ordered
     expect(statsd).to receive(:timing).with("mykey.exclusive.sql.read", 2).ordered
     expect(statsd).to receive(:timing).with('mykey.exclusive.total', anything).ordered
-    expect(statsd).to receive(:timing).with("mykey.sql.read", 3).ordered
+    expect(statsd).to receive(:timing).with("mykey.sql.read", 2).ordered
+    expect(statsd).to receive(:timing).with('mykey.total', anything).ordered
+    expect(statsd).to receive(:timing).with("mykey.exclusive.sql.read", 2).ordered
+    expect(statsd).to receive(:timing).with('mykey.exclusive.total', anything).ordered
+    expect(statsd).to receive(:timing).with("mykey.sql.read", 5).ordered
     expect(statsd).to receive(:timing).with('mykey.total', anything).ordered
     expect(statsd).to receive(:timing).with("mykey.exclusive.sql.read", 1).ordered
     expect(statsd).to receive(:timing).with('mykey.exclusive.total', anything).ordered
@@ -32,6 +36,10 @@ describe CanvasStatsd::BlockTracking do
         ActiveSupport::Notifications.instrument('sql.active_record', name: "LOAD", sql: "SELECT * FROM users") {}
         ActiveSupport::Notifications.instrument('sql.active_record', name: "LOAD", sql: "SELECT * FROM users") {}
       end
+      CanvasStatsd::BlockTracking.track("mykey", category: :nested, statsd: statsd, only: 'sql.read') do
+        ActiveSupport::Notifications.instrument('sql.active_record', name: "LOAD", sql: "SELECT * FROM users") {}
+        ActiveSupport::Notifications.instrument('sql.active_record', name: "LOAD", sql: "SELECT * FROM users") {}
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_statsd
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Nick Cloward
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statsd-ruby
@@ -139,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="