l2meter 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99e89f47ef4f4e2a71ff7867df4e7fd25015c1b0
-  data.tar.gz: 4ebb453038d24bb27de1aa5b2b1e9558a66760ba
+  metadata.gz: f503003e9477cf9593c912bbe56e0ec5732e5888
+  data.tar.gz: 5c0f2b7eeb06f8600b8a9204a397f46457dfea51
 SHA512:
-  metadata.gz: 24e32b52f972db37ad2878521f340520ea9b7de85d57b0716081816f5c800461c60e2f89b5c79da9dcbedada0dc5dc114e62da22ae5afe5aac90949bbe61778e
-  data.tar.gz: 587cc1f87cf361935a480c39f80f27d410bf0acd999e3b7f89f9f0b2c3f8bcedb458b7f30153f6ad7a562d35506508573d97585df17961bb6ac3c10af38b2770
+  metadata.gz: 70852339270abfbf8abcf19a5b287e92cb7244e496e5aad7a1bb64598feb9e12e4dc0e7bd888887eb3bf84ec7c1661f82ecf31602c472a4484f529259e87e8a1
+  data.tar.gz: cd3cb10da8ccb5c15a6576d81812689dc4c7d6a04781613caa9f2f647b13033f595e48b0639a1ff08dac37162d5e6b2d24c2acf5a7487a16ef9e12b618819fdf

data/lib/l2meter.rb

@@ -6,10 +6,11 @@ module L2meter
   autoload :Configuration, "l2meter/configuration"
   autoload :Emitter,       "l2meter/emitter"
   autoload :NullObject,    "l2meter/null_object"
+  autoload :ThreadSafe,    "l2meter/thread_safe"
 
-  def build
-    Emitter.new.tap do |emitter|
-      yield emitter.configuration if block_given?
-    end
+  def build(configuration: Configuration.new)
+    yield configuration if block_given?
+    emitter = Emitter.new(configuration: configuration.freeze)
+    ThreadSafe.new(emitter)
   end
 end

data/lib/l2meter/configuration.rb

@@ -2,51 +2,52 @@ module L2meter
   class Configuration
     attr_writer :output
     attr_accessor :source, :prefix
-    attr_reader :contexts
+    attr_reader :context, :key_formatter, :value_formatter, :output
 
-    def initialize
-      @contexts = []
+    DEFAULT_KEY_FORMATTER = ->(key) do
+      key.to_s.strip.downcase.gsub(/[^-a-z\d.#]+/, ?-)
     end
 
-    def output
-      @output ||= $stdout
+    DEFAULT_VALUE_FORMATTER = ->(value) do
+      value = value.to_s
+      value =~ /\s/ ? value.inspect : value
     end
 
-    def key_formatter
-      @key_formatter ||= ->(key) do
-        key.to_s.strip.downcase.gsub(/[^-a-z\d.#]+/, ?-)
-      end
+    private_constant :DEFAULT_KEY_FORMATTER, :DEFAULT_VALUE_FORMATTER
+
+    def initialize
+      @sort = false
+      @key_formatter = DEFAULT_KEY_FORMATTER
+      @value_formatter = DEFAULT_VALUE_FORMATTER
+      @output = $stdout
     end
 
     def format_keys(&block)
       @key_formatter = block
     end
 
-    def value_formatter
-      @value_formatter ||= ->(value) do
-        value = value.to_s
-        value =~ /\s/ ? value.inspect : value
-      end
-    end
-
     def format_values(&block)
       @value_formatter = block
     end
 
     def sort?
-      defined?(@apply_sort) ? @apply_sort : false
+      @sort
     end
 
     def sort=(value)
-      @apply_sort = !!value
+      @sort = !!value
     end
 
-    def context(&block)
-      @contexts = [block]
+    def context
+      if block_given?
+        @context = Proc.new
+      else
+        @context
+      end
     end
 
     def context=(block_or_value)
-      @contexts = [block_or_value]
+      @context = block_or_value
     end
   end
 end

data/lib/l2meter/emitter.rb

@@ -5,6 +5,8 @@ module L2meter
     def initialize(configuration: Configuration.new)
       @configuration = configuration
       @start_times = []
+      @contexts = []
+      @outputs = []
     end
 
     def log(*args)
@@ -26,11 +28,10 @@ module L2meter
     end
 
     def silence
-      output = configuration.output
-      configuration.output = NullObject.new
+      @outputs.push NullObject.new
       yield
     ensure
-      configuration.output = output
+      @outputs.pop
     end
 
     def measure(metric, value, unit: nil)
@@ -50,10 +51,14 @@ module L2meter
     end
 
     def context(hash_or_proc)
-      configuration_contexts.push hash_or_proc
+      @contexts.push hash_or_proc
       yield
     ensure
-      configuration_contexts.pop
+      @contexts.pop
+    end
+
+    def clone
+      self.class.new(configuration: configuration)
     end
 
     private
@@ -81,12 +86,8 @@ module L2meter
       params.merge(elapsed: "%.4fs" % elapsed)
     end
 
-    def configuration_contexts
-      configuration.contexts
-    end
-
     def current_context
-      configuration_contexts.inject({}) do |result, c|
+      contexts_queue.inject({}) do |result, c|
         current = c.respond_to?(:call) ? c.call.to_h : c.clone
         result.merge(current)
       end.to_a.reverse.to_h
@@ -113,7 +114,7 @@ module L2meter
 
       tokens.sort! if configuration.sort?
 
-      configuration.output.print tokens.join(" ") + "\n"
+      output_queue.last.print tokens.join(" ") + "\n"
     end
 
     def log_with_prefix(method, key, value, unit: nil)
@@ -150,5 +151,13 @@ module L2meter
     ensure
       return [ result, caught_exception, Time.now - time_at_start ]
     end
+
+    def contexts_queue
+      [ configuration.context, *@contexts ].compact
+    end
+
+    def output_queue
+      [ configuration.output, *@outputs ].compact
+    end
   end
 end

data/lib/l2meter/thread_safe.rb

@@ -0,0 +1,41 @@
+module L2meter
+  # This class is a wrapper around Emitter that makes sure that we have a
+  # completely separate clone of Emitter per thread running. It doesn't truly
+  # make Emitter thread-safe, it makes sure that you don't access the same
+  # instance of emitter from different threads.
+  class ThreadSafe
+    extend Forwardable
+
+    EMITTER_METHODS = %i[
+      configuration
+      context
+      count
+      log
+      measure
+      sample
+      silence
+      unique
+      with_elapsed
+    ]
+
+    private_constant :EMITTER_METHODS
+
+    def initialize(emitter)
+      @emitter = emitter.freeze
+    end
+
+    def_delegators :current_emitter, *EMITTER_METHODS
+
+    private
+
+    attr_reader :emitter
+
+    def current_emitter
+      Thread.current[thread_key] ||= emitter.clone
+    end
+
+    def thread_key
+      @thread_key ||= "_l2meter_emitter_#{emitter.object_id}".freeze
+    end
+  end
+end

data/lib/l2meter/version.rb

@@ -1,3 +1,3 @@
 module L2meter
-  VERSION = "0.0.9".freeze
+  VERSION = "0.1.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: l2meter
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Pavel Pravosud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -23,6 +23,7 @@ files:
 - lib/l2meter/configuration.rb
 - lib/l2meter/emitter.rb
 - lib/l2meter/null_object.rb
+- lib/l2meter/thread_safe.rb
 - lib/l2meter/version.rb
 homepage: https://github.com/heroku/l2meter
 licenses:
@@ -44,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: L2met friendly log formatter