l2meter 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca72b1aefa9cc8a14625c446cdba60322189cf28
-  data.tar.gz: 37facf6c0d869aa46d2f0cc9eb51ad2a90e70991
+  metadata.gz: 0cbfc8921bc865126c979734995c67271967b7d2
+  data.tar.gz: 8f5f6484144b0a7b7dc402f01a7f4bf5eb71370b
 SHA512:
-  metadata.gz: 17fa618bc634d0aca1784e8c057dd97c4360b6b61e932162c6ea22a8aedb3e57494711883dd3c2c5c67632a2c997fd555473ac6cbbec14cd6acbc0c9e0c55f4d
-  data.tar.gz: 9b8af786812aa2113c2baf321866166f4b8da90e363757494e69ca3c3d74ca098518c92c153c60e640509d3304d22fd7d9c3c330e085c61e7c4e90314b62aa8d
+  metadata.gz: f462a4e6cb2bbb2cf59440ceb9e4b5cece82efc834e67e4adf2c4e6abd03daee45bd9230e924c051480a2c3282a3dc6e93b49a3969bb1d692f6174a089196777
+  data.tar.gz: c4b23fb0182c6295ec25fac023305e6717bbdad1aa120bfd206e5f6a69a4d88f7f3292eba01e54f5de304cfba6a91f3431004488fc47dd3b9e8d5712758344ed

data/README.md

@@ -145,7 +145,7 @@ config.context = { app_name: "my-app-name" }
 
 # ...
 
-Metrics.log foo: :bar # => app-name=my-app-name foo-bar
+Metrics.log foo: :bar # => app-name=my-app-name foo=bar
 ```
 
 Dynamic context is also supported:

data/lib/l2meter/configuration.rb

@@ -46,8 +46,6 @@ module L2meter
       end
     end
 
-    def context=(block_or_value)
-      @context = block_or_value
-    end
+    attr_writer :context
   end
 end

data/lib/l2meter/emitter.rb

@@ -10,7 +10,7 @@ module L2meter
     end
 
     def log(*args)
-      params = transform_log_args(*args)
+      params = unwrap(*args)
       params = merge_contexts(params)
 
       if block_given?
@@ -50,7 +50,7 @@ module L2meter
       log_with_prefix :sample, metric, value, unit: unit
     end
 
-    def count(metric, value=1)
+    def count(metric, value = 1)
       log_with_prefix :count, metric, value
     end
 
@@ -58,11 +58,12 @@ module L2meter
       log_with_prefix :unique, metric, value
     end
 
-    def context(hash_or_proc)
-      @contexts.push hash_or_proc
+    def context(*context_data)
+      return clone_with_context(context_data) unless block_given?
+      push_context context_data
       yield
     ensure
-      @contexts.pop
+      context_data.length.times { @contexts.pop }
     end
 
     def clone
@@ -76,11 +77,23 @@ module L2meter
       flush_buffer @outputs.pop
     end
 
+    protected
+
+    def push_context(context_data)
+      @contexts.concat context_data.reverse
+    end
+
     private
 
-    def transform_log_args(*args)
+    def clone_with_context(context)
+      clone.tap do |emitter|
+        emitter.push_context context
+      end
+    end
+
+    def unwrap(*args)
       params = Hash === args.last ? args.pop : {}
-      args = args.compact.map { |key| [ key, true ] }.to_h
+      args = args.compact.map { |key| [key, true] }.to_h
       args.merge(params)
     end
 
@@ -102,9 +115,9 @@ module L2meter
     end
 
     def current_context
-      contexts_queue.inject({}) do |result, c|
-        current = c.respond_to?(:call) ? c.call.to_h : c.clone
-        result.merge(current)
+      contexts_queue.inject({}) do |result, context|
+        context = context.call if context.respond_to?(:call)
+        result.merge(unwrap(context))
       end.to_a.reverse.to_h
     end
 
@@ -124,19 +137,16 @@ module L2meter
 
     def write(params)
       tokens = format_keys(params).map do |key, value|
-        value == true ? key : [ key, format_value(value) ] * ?=
+        value == true ? key : [key, format_value(value)] * ?=
       end
 
-      tokens.sort! if configuration.sort?
-
-      emit tokens
+      emit configuration.sort?? tokens.sort : tokens
     end
 
     def emit(tokens)
       output_queue.last.puts [*tokens].join(" ")
     end
 
-
     def log_with_prefix(method, key, value, unit: nil)
       key = [configuration.prefix, key, unit].compact * ?.
       log Hash["#{method}##{key}", value]
@@ -145,36 +155,34 @@ module L2meter
     def wrap(params)
       write params.merge(at: :start)
 
-      result, exception, elapsed = execute_with_elapsed(&proc)
+      result, error, elapsed = execute_with_elapsed(&proc)
 
-      if exception
-        status = { at: :exception, exception: exception.class.name, message: exception.message.strip }
+      status = if error
+        { at: :exception, exception: error.class, message: error.message.strip }
       else
-        status = { at: :finish }
+        { at: :finish }
       end
 
-      status = merge_elapsed(elapsed, status)
-
-      write params.merge(status)
+      write params.merge(merge_elapsed(elapsed, status))
 
-      raise exception if exception
+      raise error if error
 
       result
     end
 
     def execute_with_elapsed
       time_at_start = Time.now
-      [ yield, nil, Time.now - time_at_start ]
-    rescue Exception => exception
-      [ nil, exception, Time.now - time_at_start ]
+      [yield, nil, Time.now - time_at_start]
+    rescue Object => exception
+      [nil, exception, Time.now - time_at_start]
     end
 
     def contexts_queue
-      [ configuration.context, *@contexts ].compact
+      [configuration.context, *@contexts].compact
     end
 
     def output_queue
-      [ configuration.output, *@outputs ].compact
+      [configuration.output, *@outputs].compact
     end
 
     def flush_buffer(buffer)

data/lib/l2meter/thread_safe.rb

@@ -15,6 +15,7 @@ module L2meter
       count
       log
       measure
+      push_context
       sample
       silence
       silence!

data/lib/l2meter/version.rb

@@ -1,3 +1,3 @@
 module L2meter
-  VERSION = "0.3.1".freeze
+  VERSION = "0.4.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: l2meter
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Pavel Pravosud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-27 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: L2met friendly log formatter