fiveruns-dash-ruby 0.7.3 → 0.7.4

data/lib/fiveruns/dash/instrument.rb

@@ -36,7 +36,7 @@ module Fiveruns::Dash
       end
     end
 
-    def self.reentrant_timing(token, offset, this, args)
+    def self.reentrant_timing(token, offset, this, limit_to_within, args)
       # token allows us to handle re-entrant timing, see e.g. ar_time
       Thread.current[token] = 0 if Thread.current[token].nil?
       Thread.current[token] = Thread.current[token] + 1
@@ -47,19 +47,29 @@ module Fiveruns::Dash
         time = Time.now - start
         Thread.current[token] = Thread.current[token] - 1
         if Thread.current[token] == 0
-          ::Fiveruns::Dash::Instrument.handlers[offset].call(this, time, *args)
+          if !limit_to_within || (Thread.current[:dash_markers] || []).include?(limit_to_within)
+            ::Fiveruns::Dash::Instrument.handlers[offset].call(this, time, *args)
+          end
         end
       end
       result
     end
     
-    def self.timing(offset, this, args)
+    def self.timing(offset, this, args, mark, limit_to_within)
+      if mark
+        Thread.current[:dash_markers] ||= []
+        Thread.current[:dash_markers].push mark
+      end
       start = Time.now
       begin
         result = yield
       ensure
         time = Time.now - start
-        ::Fiveruns::Dash::Instrument.handlers[offset].call(this, time, *args)
+        Thread.current[:dash_markers].pop if mark
+
+        if !limit_to_within || (Thread.current[:dash_markers] || []).include?(limit_to_within)
+          ::Fiveruns::Dash::Instrument.handlers[offset].call(this, time, *args)
+        end
       end
       result
     end
@@ -85,13 +95,13 @@ module Fiveruns::Dash
           EXCEPTIONS
         elsif options[:reentrant_token]
           <<-REENTRANT
-            ::Fiveruns::Dash::Instrument.reentrant_timing(:id#{options[:reentrant_token]}, #{offset}, self, args) do
+            ::Fiveruns::Dash::Instrument.reentrant_timing(:id#{options[:reentrant_token]}, #{offset}, self, #{options[:only_within] ? ":#{options[:only_within]}" : 'nil'}, args) do
               #{without}(*args, &block)
             end
           REENTRANT
         else
           <<-PERFORMANCE
-            ::Fiveruns::Dash::Instrument.timing(#{offset}, self, args) do
+            ::Fiveruns::Dash::Instrument.timing(#{offset}, self, args, #{options[:mark_as] ? ":#{options[:mark_as]}" : 'nil'}, #{options[:only_within] ? ":#{options[:only_within]}" : 'nil'}) do
               #{without}(*args, &block)
             end
           PERFORMANCE

data/lib/fiveruns/dash/metric.rb

@@ -164,12 +164,12 @@ module Fiveruns::Dash
               bad_value! "Contexts must have an even number of items"
             end
           else
-            bad_value! "Unknown context type"
+            bad_value! "Unknown context type: #{key.class.name}"
           end
           all
         end
       else
-        bad_value! "Unknown value type"
+        bad_value! "Unknown value type: #{value.class.name}"
       end
     end
     
@@ -268,6 +268,8 @@ module Fiveruns::Dash
     def instrument_options
       returning({}) do |options|
         options[:reentrant_token] = self.object_id.abs if @options[:reentrant]
+        options[:only_within] = @options[:only_within] if @options[:only_within]
+        options[:mark_as] = @name if @options[:mark]
       end
     end
 

data/version.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 7
-:patch: 3
+:patch: 4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fiveruns-dash-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors: 
 - FiveRuns Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-02 00:00:00 -08:00
+date: 2009-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency