l2meter 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f4adb53ff781efc36f715a3cace441b9020719f
-  data.tar.gz: fd0e1932d11244637a20f3d63430ea176cf69441
+  metadata.gz: ca246ee77800547afc00d19c21279922ed64a4d1
+  data.tar.gz: 6521d7dd5b8ded99ed1de5580681d800fdb67f3f
 SHA512:
-  metadata.gz: 8aeeb27f3afa5ddcb71db8dce17ee624e339cae4fccc7ba064cbdf65372e51609da4849e93d575297332e40851d11d618d0c40266ba2ac198cf485bfb07b8033
-  data.tar.gz: 8a8a6555a573d7743f2a94939c1a7e8b51cbff0c226e8fb9de3f1f660dc748857ed32e4d18fc901545764a99223d59b074520661744fdea23d4a31fe7ba4cea1
+  metadata.gz: 656126158ebdc783c4a1d160bf2043bf6d93fe1653e04f13bdea8eac40a6c9366afae7f553a29c1aabbbc711a91a35e8ba25f21490d965b9eb8b746976592480
+  data.tar.gz: 6b388f5d352734326369b7c7d4ed4210d39f5da503c573a1b7f43976d2c00122acdc860ea0e4965790c688a42f9108bdb05abdc71394d95a28ada18008c4cd53

data/lib/l2meter/emitter.rb

@@ -8,16 +8,12 @@ module L2meter
       @configuration = configuration
       @buffer = {}
       @autoflush = true
-      @start_times = []
       @contexts = []
       @outputs = []
     end
 
     def log(*args)
-      merge! source: configuration.source
-      merge! *current_contexts
-      merge! *args
-      elapse!
+      merge! *current_contexts, *args
 
       if block_given?
         wrap &proc
@@ -26,11 +22,8 @@ module L2meter
       end
     end
 
-    def with_elapsed
-      @start_times << Time.now
-      yield
-    ensure
-      @start_times.pop
+    def with_elapsed(start_time = Time.now, &block)
+      context(elapsed_context(start_time), &block)
     end
 
     def with_output(output)
@@ -153,6 +146,8 @@ module L2meter
         format_float(value)
       when Time
         value.iso8601
+      when Proc
+        format_value(value.call)
       when Hash
         format_value(value.inspect)
       when Array
@@ -193,8 +188,7 @@ module L2meter
         merge! params, at: :exception, exception: exception.class, message: exception.message
       end
 
-      elapse! start_time
-      write
+      write elapsed_context(start_time)
 
       raise exception if exception
 
@@ -202,16 +196,23 @@ module L2meter
     end
 
     def contexts_queue
-      [configuration.context, *@contexts].compact
+      [configuration.context, source_context, *@contexts].compact
     end
 
     def output_queue
       [configuration.output, *@outputs].compact
     end
 
-    def elapse!(since = @start_times.last)
-      return unless since
-      merge! elapsed: format_float(Time.now - since, unit: ?s)
+    def source_context
+      { source: configuration.source }
+    end
+
+    def elapsed_context(since = Time.now)
+      { elapsed: -> { elapsed_value(since) }}
+    end
+
+    def elapsed_value(since)
+      format_float(Time.now - since, unit: ?s)
     end
   end
 end

data/lib/l2meter/version.rb

@@ -1,3 +1,3 @@
 module L2meter
-  VERSION = "0.8.0".freeze
+  VERSION = "0.9.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: l2meter
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Pavel Pravosud