sleuth 0.2.0 → 0.2.1

data/lib/sleuth.rb

@@ -5,9 +5,13 @@ require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/notifications'
 require 'active_support/buffered_logger'
 
+require 'time'
+
 module Sleuth
   TRANSACTION_HEADER = "X_SLEUTH_TRANSACTION"
 
+  class OutsideTransaction < StandardError; end
+
   class << self
     delegate :head, :get, :post, :put, :delete, :to => :http
 
@@ -18,14 +22,18 @@ module Sleuth
     end
 
     def instrument(payload)
-      ActiveSupport::Notifications.instrument(:sleuth, payload) do
-        yield
+      if inside_transaction?
+        ActiveSupport::Notifications.instrument(:sleuth, payload) do
+          yield
+        end
+      else
+        raise OutsideTransaction, "You are outside of a transaction"
       end
     end
 
     def transaction(current_name, parent = nil)
       ActiveSupport::Notifications.transaction do
-        Transaction.create(current_name, current_id, parent)
+        Transaction.create(current_name, parent)
 
         yield
       end
@@ -39,10 +47,29 @@ module Sleuth
       Transaction.running[current_id]
     end
 
+    def inside_transaction?
+      current_transaction
+    end
+
+    def thread(name)
+      parent = current_transaction && current_transaction.full_name
+      Thread.new {
+        transaction(name, parent) do
+          yield
+        end
+      }
+    end
+
     def watch(log_path)
       logger = ActiveSupport::BufferedLogger.new(log_path)
+      subscribe do |event|
+        logger.debug(Transaction.message_for(event))
+      end
+    end
+
+    def subscribe
       ActiveSupport::Notifications.subscribe('sleuth') do |*args|
-        logger.debug(Transaction.message_for(*args))
+        yield Event.new(*args)
       end
     end
   end

data/lib/sleuth/transaction.rb

@@ -13,12 +13,12 @@ module Sleuth
     mattr_reader :running
     @@running = {}
 
-    def self.create(name, id, parent)
+    def self.create(name, parent)
+      id = Sleuth.current_id
       running[id] = new(name, id, Time.now.to_i, Process.pid, parent)
     end
 
-    def self.message_for(*args)
-      event = Event.new(*args)
+    def self.message_for(event)
       transaction = running[event.transaction_id]
       transaction.message_for(event)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sleuth
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Tim Carey-Smith