sleuth 0.2.1 → 0.2.2

data/lib/sleuth.rb

@@ -10,8 +10,6 @@ require 'time'
 module Sleuth
   TRANSACTION_HEADER = "X_SLEUTH_TRANSACTION"
 
-  class OutsideTransaction < StandardError; end
-
   class << self
     delegate :head, :get, :post, :put, :delete, :to => :http
 
@@ -27,7 +25,7 @@ module Sleuth
           yield
         end
       else
-        raise OutsideTransaction, "You are outside of a transaction"
+        yield
       end
     end
 
@@ -63,7 +61,7 @@ module Sleuth
     def watch(log_path)
       logger = ActiveSupport::BufferedLogger.new(log_path)
       subscribe do |event|
-        logger.debug(Transaction.message_for(event))
+        logger.debug(event.message)
       end
     end
 
@@ -78,4 +76,5 @@ end
 current_dir = File.expand_path(File.dirname(__FILE__) + '/sleuth')
 require current_dir + '/middleware'
 require current_dir + '/outbound_handler'
+require current_dir + '/event'
 require current_dir + '/transaction'

data/lib/sleuth/event.rb

@@ -0,0 +1,21 @@
+module Sleuth
+  class Event < ActiveSupport::Notifications::Event
+    def formatted_time
+      "%s%06d" % [time.utc.iso8601, time.usec]
+    end
+
+    def formatted_end
+      "%s%06d" % [@end.utc.iso8601, @end.usec]
+    end
+
+    def transaction
+      Transaction.running[transaction_id]
+    end
+
+    def message
+      parts = [formatted_time, formatted_end, transaction.full_name,
+               transaction.parent || '-', duration, payload.inspect]
+      "%s %s %s %s %0.4f -- %s" % parts
+    end
+  end
+end

data/lib/sleuth/outbound_handler.rb

@@ -7,7 +7,9 @@ module Sleuth
     def call(env)
       request = Rack::Request.new(env)
       Sleuth.instrument("Sending #{request.request_method} #{request.url}") do
-        env["HTTP_#{TRANSACTION_HEADER}"] = Sleuth.current_transaction.full_name
+        if Sleuth.inside_transaction?
+          env["HTTP_#{TRANSACTION_HEADER}"] = Sleuth.current_transaction.full_name
+        end
         @app.call(env)
       end
     end

data/lib/sleuth/transaction.rb

@@ -1,14 +1,4 @@
 module Sleuth
-  class Event < ActiveSupport::Notifications::Event
-    def formatted_time
-      "%s%06d" % [time.utc.iso8601, time.usec]
-    end
-
-    def formatted_end
-      "%s%06d" % [@end.utc.iso8601, @end.usec]
-    end
-  end
-
   class Transaction < Struct.new(:name, :id, :stamp, :pid, :parent)
     mattr_reader :running
     @@running = {}
@@ -18,17 +8,6 @@ module Sleuth
       running[id] = new(name, id, Time.now.to_i, Process.pid, parent)
     end
 
-    def self.message_for(event)
-      transaction = running[event.transaction_id]
-      transaction.message_for(event)
-    end
-
-    def message_for(event)
-      parts = [event.formatted_time, event.formatted_end,
-               full_name, parent || '-', event.duration, event.payload.inspect]
-      "%s %s %s %s %0.4f -- %s" % parts
-    end
-
     def full_name
       "#{name}-#{id}-#{stamp}-#{pid}"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sleuth
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Tim Carey-Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 -08:00
+date: 2009-11-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +28,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 0.2.0
     version: 
@@ -41,6 +41,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/sleuth/event.rb
 - lib/sleuth/middleware.rb
 - lib/sleuth/outbound_handler.rb
 - lib/sleuth/transaction.rb