l2meter 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd6772c37f01a4c133505ba3a9ae1f4024169e2c
-  data.tar.gz: 21fa24020d0957dc14dd2e83c178dcc8904a436a
+  metadata.gz: bffe75a295c408136d1a2e4aa04bed633933381e
+  data.tar.gz: 5b3dbea7648cee86c9cef54334ec568e5a7a044f
 SHA512:
-  metadata.gz: 55d30f2dab010527aea006c4ad0653f0571ce5b8c51b1ce03cde832a0b9419a0be146b17385b2ef3eb1e0b404e7fb8482e3ec09ba913fcdfa0042bfb5a6d95df
-  data.tar.gz: aa3f76c6f75db2f899579440305ce029c61a96b2182954972f11601f9c5942fa565d225181ed70259fac6514eadcb0fe94df4767dec8faea23159dfb1eeaeb2f
+  metadata.gz: 9ee9b15dc8fa10b16379dcc291dd40e89aa6bd7dff8b471395ea2291493556e4cb6806b81182b023efdfc758b15603afe7c159dee86fbac15ac1747cd1b77569
+  data.tar.gz: 3d3537ffa3a3b8593a2236590ad4f5d0e2c4fe7181b757fc5eacd418372f81970d9e82e8602bfdff52693c3de61eede19cf7f643d7ae63f99c34752fc0393a76

data/README.md

@@ -102,6 +102,17 @@ metrics.sample :db_query, 235, unit: :ms,  # => sample#db-query.ms=235
 metrics.unique :user, "bob@example.com"    # => unique#user=bob@example.com
 ```
 
+L2meter also allows to append elapsed time to your log messages automatically.
+
+```ruby
+metrics.with_elapsed do
+  do_work_step_1
+  log :step_1_done # => step-1-done elapsed=1.2345s
+  do_work_step_2
+  log :step_2_done # => step-2-done elapsed=2.3456s
+end
+```
+
 ### Configuration
 
 L2meter supports configuration. Here's how you can configure things:

data/lib/l2meter/emitter.rb

@@ -4,14 +4,12 @@ module L2meter
 
     def initialize(configuration: Configuration.new)
       @configuration = configuration
+      @start_times = []
     end
 
     def log(*args)
-      params = Hash === args.last ? args.pop : {}
-      args = args.map { |key| [ key, true ] }.to_h
-      params = args.merge(params)
-      params = current_context.merge(params)
-      params = merge_source(params)
+      params = transform_log_args(*args)
+      params = merge_contexts(params)
 
       if block_given?
         wrap params, &Proc.new
@@ -20,6 +18,13 @@ module L2meter
       end
     end
 
+    def with_elapsed
+      @start_times << Time.now
+      yield
+    ensure
+      @start_times.pop
+    end
+
     def silence
       output = configuration.output
       configuration.output = NullObject.new
@@ -53,13 +58,31 @@ module L2meter
 
     private
 
-    def configuration_contexts
-      configuration.contexts
+    def transform_log_args(*args)
+      params = Hash === args.last ? args.pop : {}
+      args = args.map { |key| [ key, true ] }.to_h
+      args.merge(params)
     end
 
-    def merge_source(params)
+    def merge_contexts(params)
+      params = current_context.merge(params)
       source = configuration.source
-      source ? { source: source }.merge(params) : params
+      params = { source: source }.merge(params) if source
+
+      if start_time = @start_times.last
+        elapsed = Time.now - start_time
+        params = merge_elapsed(elapsed, params)
+      end
+
+      params
+    end
+
+    def merge_elapsed(elapsed, params)
+      params.merge(elapsed: "%.4fs" % elapsed)
+    end
+
+    def configuration_contexts
+      configuration.contexts
     end
 
     def current_context
@@ -99,22 +122,33 @@ module L2meter
     end
 
     def wrap(params)
-      time_at_start = Time.now
       write params.merge(at: :start)
-      result = yield
-    rescue Exception => error
-      # Rescuing Exception class is a well-known anitpattern, I know. But in
-      # this case we're just setting a variable and re-raising immidiately,
-      # which should probably be fine in most cases.
-      status = { at: :exception, exception: error.class.to_s, message: error.message.strip }
-      raise
-    else
-      status = { at: :finish }
+
+      result, exception, elapsed = execute_with_elapsed(&Proc.new)
+
+      if exception
+        status = { at: :exception, exception: exception.class.name, message: exception.message }
+      else
+        status = { at: :finish }
+      end
+
+      status = merge_elapsed(elapsed, status)
+
+      write params.merge(status)
+
+      raise exception if exception
+
       result
+    end
+
+    def execute_with_elapsed
+      time_at_start = Time.now
+      caught_exception = nil
+      result = yield
+    rescue Exception => exception
+      caught_exception = exception
     ensure
-      elapsed = Time.now - time_at_start
-      status.merge! elapsed: "%.4fs" % elapsed
-      write params.merge(status)
+      return [ result, caught_exception, Time.now - time_at_start ]
     end
   end
 end

data/lib/l2meter/version.rb

@@ -1,3 +1,3 @@
 module L2meter
-  VERSION = "0.0.7".freeze
+  VERSION = "0.0.8".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: l2meter
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Pavel Pravosud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: