overall_request_times 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a88359fad7231f21acf8e61bd40debe33bc7f9be
-  data.tar.gz: ab4ec3e028f4e324fe8d72ce28512152d8cef0df
+  metadata.gz: 6cfb784b756679539fbcc5f3b86bad33a3fde701
+  data.tar.gz: af6e82fa47bc035370942cad03a944693742518a
 SHA512:
-  metadata.gz: 3543abc8635f44540fb722be6312d2a36c8174a4475a1d61db7c404088a9ab68b45c0c78f339fb8e791b35e13ed6e7c3dc8fef7730c11be8b83146b9358e29ba
-  data.tar.gz: f647517b2f00643c96c683184ab2fbb7c352127cb6fa3b6bffe50e6333784d0454ecd5cd8f3f23c3f7eaa5828361be65c7cac34fcd2f60c3ece125e6c74b63f1
+  metadata.gz: 6b409c978b34f335ddd57eea9a0c33eb91a1f259d765b4511d707e80d15b6b1a5e37c2d843aaaf9946619fb12be05f8c462ded50bce0b292736a12469af775dc
+  data.tar.gz: 7bf0ab514ed14e6231418b8fc337695986b9648aa849b3db717d030b2533cdc7116946ba188ce27b265634acc41c5697b323fc69d93687b19629daa91915a2c8

data/README.md

@@ -10,9 +10,9 @@ time.
 Includes a [Faraday](https://github.com/lostisland/faraday) middleware and
 generic implimentation.
 
-## WARNING
+## Threadsafety
 
-I do not know if this is threadsafe yet. Assume it is not.
+It's got mutexes, so it might be threadsafe. No guarantees.
 
 ## Installation
 

data/lib/overall_request_times/generic_timer.rb

@@ -2,8 +2,8 @@ module OverallRequestTimes
   class GenericTimer
     include Timer
 
-    def initialize(remote_app_name)
-      timer_setup(remote_app_name)
+    def initialize(remote_app_name, in_mutex = false)
+      timer_setup(remote_app_name, in_mutex)
     end
   end
 end

data/lib/overall_request_times/registry.rb

@@ -0,0 +1,71 @@
+require "thread"
+module OverallRequestTimes
+  class Registry
+    def initialize
+      @registry = {}
+      @mutex = Mutex.new
+    end
+
+    def size
+      @mutex.synchronize do
+        @registry.size
+      end
+    end
+
+    def reset!
+      @mutex.synchronize do
+        @registry.each { |_, timer| timer.reset! }
+      end
+    end
+
+    def register(timer)
+      @mutex.synchronize do
+        @registry[timer.remote_app_name] ||= timer
+      end
+    end
+
+    def total_for(remote_app_name)
+      @mutex.synchronize do
+        timer = @registry[remote_app_name]
+        timer ? timer.total : 0
+      end
+    end
+
+    def totals
+      @mutex.synchronize do
+        @registry.each_with_object({}) do |(remote_app_name, timer), acc|
+          acc[remote_app_name] = timer.total
+        end
+      end
+    end
+
+    def bm(remote_app_name, &block)
+      start(remote_app_name)
+      begin
+        block.call
+      ensure
+        stop(remote_app_name)
+      end
+    end
+
+    def start(remote_app_name)
+      @mutex.synchronize do
+        @registry[remote_app_name] ||= GenericTimer.new(remote_app_name, true)
+        @registry[remote_app_name].start
+      end
+    end
+
+    def stop(remote_app_name)
+      @mutex.synchronize do
+        @registry[remote_app_name] && @registry[remote_app_name].stop
+      end
+    end
+
+    def add_duration(remote_app_name, duration_in_seconds)
+      @mutex.synchronize do
+        @registry[remote_app_name] ||= GenericTimer.new(remote_app_name, true)
+        @registry[remote_app_name].add(duration_in_seconds)
+      end
+    end
+  end
+end

data/lib/overall_request_times/timer.rb

@@ -1,23 +1,31 @@
+require "thread"
 module OverallRequestTimes
   module Timer
     attr_reader :remote_app_name
 
-    def timer_setup(remote_app_name)
+    def timer_setup(remote_app_name, in_mutex = false)
       @remote_app_name = remote_app_name
+      @timer_mutex = Mutex.new
       reset!
-      OverallRequestTimes.register(self)
+      OverallRequestTimes.register(self) unless in_mutex
     end
 
     def total
-      @total
+      @timer_mutex.synchronize do
+        @total
+      end
     end
 
     def reset!
-      @total = 0
+      @timer_mutex.synchronize do
+        @total = 0
+      end
     end
 
     def add(some_time)
-      @total += some_time
+      @timer_mutex.synchronize do
+        @total += some_time
+      end
     end
 
     def start
@@ -27,7 +35,7 @@ module OverallRequestTimes
     def stop
       return unless @started_at
       ended_at = Time.now
-      add(ended_at - @started_at)
+      add(ended_at.to_f - @started_at.to_f)
     end
   end
 end

data/lib/overall_request_times/version.rb

@@ -1,3 +1,3 @@
 module OverallRequestTimes
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/lib/overall_request_times.rb

@@ -6,54 +6,47 @@ module OverallRequestTimes
   autoload :FaradayMiddleware, "overall_request_times/faraday_middleware"
   autoload :GenericTimer, "overall_request_times/generic_timer"
   autoload :RailsMiddleware, "overall_request_times/rails_middleware"
+  autoload :Registry, "overall_request_times/registry"
 
-  def self.wipeout_registry
-    @registry = nil
+  def self.registry
+    @registry
   end
 
-  def self.registry
-    @registry ||= {}
+  def self.wipeout_registry
+    @registry = Registry.new
   end
 
   def self.reset!
-    registry.each { |_, timer| timer.reset! }
+    registry.reset!
   end
 
   def self.register(timer)
-    registry[timer.remote_app_name] ||= timer
+    registry.register(timer)
   end
 
   def self.total_for(remote_app_name)
-    timer = registry[remote_app_name]
-    timer ? timer.total : 0
+    registry.total_for(remote_app_name)
   end
 
   def self.totals
-    registry.each_with_object({}) do |(remote_app_name, timer), acc|
-      acc[remote_app_name] = timer.total
-    end
+    registry.totals
   end
 
   def self.bm(remote_app_name, &block)
-    start(remote_app_name)
-    begin
-      block.call
-    ensure
-      stop(remote_app_name)
-    end
+    registry.bm(remote_app_name, &block)
   end
 
   def self.start(remote_app_name)
-    registry[remote_app_name] ||= GenericTimer.new(remote_app_name)
-    registry[remote_app_name].start
+    registry.start(remote_app_name)
   end
 
   def self.stop(remote_app_name)
-    registry[remote_app_name] && registry[remote_app_name].stop
+    registry.stop(remote_app_name)
   end
 
   def self.add_duration(remote_app_name, duration_in_seconds)
-    registry[remote_app_name] ||= GenericTimer.new(remote_app_name)
-    registry[remote_app_name].add(duration_in_seconds)
+    registry.add_duration(remote_app_name, duration_in_seconds)
   end
 end
+
+OverallRequestTimes.wipeout_registry

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overall_request_times
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Donald Plummer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -115,6 +115,7 @@ files:
 - lib/overall_request_times/generic_timer.rb
 - lib/overall_request_times/rails_middleware.rb
 - lib/overall_request_times/railtie.rb
+- lib/overall_request_times/registry.rb
 - lib/overall_request_times/timer.rb
 - lib/overall_request_times/version.rb
 - overall_request_times.gemspec