betterlog 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 745c31c2af64dead7f6c4caef9ba763c4f03242d981668a945047017bd040e4d
-  data.tar.gz: e63e066eeae23e30048c2f1d132ffb8c6c93e633d1670e3dfd208c5682ef54f7
+  metadata.gz: 41bb65aafa33ccbe83390a1d8a4a68a98f9a88ff94c50de62b71afe32f81fac2
+  data.tar.gz: e4c9c13fdb23f7448744ef34dfd6667cb1ce8de6a6e8dda6017ccbf874d19fd2
 SHA512:
-  metadata.gz: 3cb7b7a8b3ff230deca829d39f319d63d4177dacf19f2f5bf8b5688ea6cb8aa0c61c1c33eaf10370480fe0cf449273989e8a1cd2ca97bfc45bfe2fc7ffc79514
-  data.tar.gz: '08df00e3be93a83e87be11098b71a79b8c073d62951ff1aadcc1772e4ecbf871796abaa13f02b250849ae8534f0bd2af25e9699099be46bfc872d52ebf014669'
+  metadata.gz: 55b3b6f9ac7ed4d641902c798cb6c372c082302c2a3a8b93373b333055168e7647f90229c285a287b886d5f90d8cd09ef4c49fefa268e720cd25b3f6590a902b
+  data.tar.gz: 96415752787e2ac1e3345bdfa448fdb6f752dad4d338d0ef940473c7596c167635ea9e5660ef7d8313af3a1201ae2efd21a80a92eb6838f25cbaa37e1051853d

data/.all_images.yml

@@ -0,0 +1,17 @@
+dockerfile: |-
+  RUN apk add --no-cache build-base git
+  RUN gem update --system
+  RUN gem install gem_hadar bundler
+
+script: &script |-
+  echo -e "\e[1m"
+  ruby -v
+  echo -e "\e[0m"
+  bundle
+  rake spec
+
+fail_fast: yes
+
+images:
+  ruby:3.2-alpine: *script
+  ruby:3.1-alpine: *script

data/.tool-versions

@@ -1,2 +1,2 @@
-ruby 3.1.2
+ruby 3.1.4
 bundler 2.3.17

data/Rakefile

@@ -29,6 +29,8 @@ GemHadar do
   development_dependency 'rake'
   development_dependency 'rspec'
   development_dependency 'simplecov'
+  development_dependency 'debug'
+  development_dependency 'all_images'
 end
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-1.1.1
+2.0.0

data/betterlog.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
-# stub: betterlog 1.1.1 ruby lib
+# stub: betterlog 2.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "betterlog".freeze
-  s.version = "1.1.1"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["betterplace Developers".freeze]
-  s.date = "2023-08-16"
+  s.date = "2023-08-17"
   s.description = "This library provides structure json logging for our rails projects".freeze
   s.email = "developers@betterplace.org".freeze
   s.executables = ["betterlog".freeze]
   s.extra_rdoc_files = ["README.md".freeze, "lib/betterlog.rb".freeze, "lib/betterlog/global_metadata.rb".freeze, "lib/betterlog/log.rb".freeze, "lib/betterlog/log/event.rb".freeze, "lib/betterlog/log/event_formatter.rb".freeze, "lib/betterlog/log/severity.rb".freeze, "lib/betterlog/log_event_formatter.rb".freeze, "lib/betterlog/notifiers.rb".freeze, "lib/betterlog/railtie.rb".freeze, "lib/betterlog/version.rb".freeze]
-  s.files = [".github/workflows/codeql-analysis.yml".freeze, ".gitignore".freeze, ".semaphore/semaphore.yml".freeze, ".tool-versions".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "betterlog.gemspec".freeze, "bin/betterlog".freeze, "config/log.yml".freeze, "lib/betterlog.rb".freeze, "lib/betterlog/global_metadata.rb".freeze, "lib/betterlog/log.rb".freeze, "lib/betterlog/log/event.rb".freeze, "lib/betterlog/log/event_formatter.rb".freeze, "lib/betterlog/log/severity.rb".freeze, "lib/betterlog/log_event_formatter.rb".freeze, "lib/betterlog/notifiers.rb".freeze, "lib/betterlog/railtie.rb".freeze, "lib/betterlog/version.rb".freeze, "spec/betterlog/global_metadata_spec.rb".freeze, "spec/betterlog/log/event_spec.rb".freeze, "spec/betterlog/log/severity_spec.rb".freeze, "spec/betterlog/log_event_formatter_spec.rb".freeze, "spec/betterlog/log_spec.rb".freeze, "spec/betterlog/version_spec.rb".freeze, "spec/spec_helper.rb".freeze]
+  s.files = [".all_images.yml".freeze, ".github/workflows/codeql-analysis.yml".freeze, ".gitignore".freeze, ".semaphore/semaphore.yml".freeze, ".tool-versions".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "betterlog.gemspec".freeze, "bin/betterlog".freeze, "config/log.yml".freeze, "lib/betterlog.rb".freeze, "lib/betterlog/global_metadata.rb".freeze, "lib/betterlog/log.rb".freeze, "lib/betterlog/log/event.rb".freeze, "lib/betterlog/log/event_formatter.rb".freeze, "lib/betterlog/log/severity.rb".freeze, "lib/betterlog/log_event_formatter.rb".freeze, "lib/betterlog/notifiers.rb".freeze, "lib/betterlog/railtie.rb".freeze, "lib/betterlog/version.rb".freeze, "spec/betterlog/global_metadata_spec.rb".freeze, "spec/betterlog/log/event_spec.rb".freeze, "spec/betterlog/log/severity_spec.rb".freeze, "spec/betterlog/log_event_formatter_spec.rb".freeze, "spec/betterlog/log_spec.rb".freeze, "spec/betterlog/version_spec.rb".freeze, "spec/spec_helper.rb".freeze]
   s.homepage = "http://github.com/betterplace/betterlog".freeze
   s.rdoc_options = ["--title".freeze, "Betterlog".freeze, "--main".freeze, "README.md".freeze]
-  s.rubygems_version = "3.3.25".freeze
+  s.rubygems_version = "3.3.26".freeze
   s.summary = "Structured logging support for bp".freeze
   s.test_files = ["spec/betterlog/global_metadata_spec.rb".freeze, "spec/betterlog/log/event_spec.rb".freeze, "spec/betterlog/log/severity_spec.rb".freeze, "spec/betterlog/log_event_formatter_spec.rb".freeze, "spec/betterlog/log_spec.rb".freeze, "spec/betterlog/version_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
@@ -29,6 +29,8 @@ Gem::Specification.new do |s|
     s.add_development_dependency(%q<rake>.freeze, [">= 0"])
     s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_development_dependency(%q<debug>.freeze, [">= 0"])
+    s.add_development_dependency(%q<all_images>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.3", ">= 1.22.0"])
     s.add_runtime_dependency(%q<complex_config>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<file-tail>.freeze, ["~> 1.0"])
@@ -41,6 +43,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rake>.freeze, [">= 0"])
     s.add_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_dependency(%q<debug>.freeze, [">= 0"])
+    s.add_dependency(%q<all_images>.freeze, [">= 0"])
     s.add_dependency(%q<tins>.freeze, ["~> 1.3", ">= 1.22.0"])
     s.add_dependency(%q<complex_config>.freeze, [">= 0"])
     s.add_dependency(%q<file-tail>.freeze, ["~> 1.0"])

data/lib/betterlog/global_metadata.rb

@@ -1,19 +1,30 @@
 # To retrieve thread-global metadata that is used to enrich data that is sent
 # to logging and debugging tools. In addition to holding the data
-# thread-global, this will also attempt to update context of error reporting
+# thread-global, this will also attempt to update current of error reporting
 # tools etc.
 
 module Betterlog
   class GlobalMetadata
     include Tins::SexySingleton
 
-    thread_local(:data) { {} }
+    thread_local(:current) { {} }
 
-    def add(data_hash)
-      data_hash = data_hash.symbolize_keys_recursive
-      data = data_hash | data
-      Notifiers.context(data_hash)
+    def add(data)
+      data = data.symbolize_keys_recursive
+      self.current = data | current
       self
     end
+
+    def remove(data)
+      keys = data.ask_and_send_or_self(:keys).map(&:to_sym)
+      keys.each { current.delete(_1) }
+    end
+
+    def with_context(data = {})
+      add data
+      yield current.dup.freeze
+    ensure
+      remove data
+    end
   end
 end

data/lib/betterlog/log/event.rb

@@ -3,42 +3,23 @@ module Betterlog
     class Event
       require 'socket'
 
-      def self.ify(arg, severity: :debug, notify: nil, rest: {})
-        notify ||= rest.delete(:notify)
+      def self.ify(arg, **rest)
+        rest = rest.symbolize_keys_recursive(circular: :circular)
         if e = arg.ask_and_send(:exception)
-          ify(
+          new(
             {
               error_class:  e.class.name,
               message:      "#{e.class.name}: #{e.message}",
               backtrace:    e.backtrace,
-            },
-            severity: severity,
-            rest: rest,
-            notify: notify,
-          )
-        elsif s = arg.ask_and_send(:to_str)
-          new(
-            ({ notify: s } if notify).to_h |
-            {
-              message:  s,
-              severity: severity,
             } | rest
           )
-        elsif h = arg.ask_and_send(:to_hash)
-          arg = h | { severity: severity } | rest
-          new(
-            ({ notify: h[:message] || arg.to_s } if notify).to_h |
-            arg
-          )
+        elsif message = arg.ask_and_send(:to_str)
+          new({ message: } | rest)
+        elsif hash = arg.ask_and_send(:to_hash)
+          new(hash | rest)
         else
           message = "Logging #{arg.inspect}"
-          new(
-            ({ notify: message } if notify).to_h |
-            {
-              message: message,
-              severity: severity,
-            } | rest
-          )
+          new({ message: } | rest)
         end
       end
 
@@ -57,16 +38,16 @@ module Betterlog
       end
 
       def initialize(data = {})
-        data = data.symbolize_keys_recursive(circular: :circular) | meta
-        unless data.key?(:message)
-          data[:message] = "a #{data[:type]} type log message of severity #{data[:severity]}"
-        end
+        data = compute_data(data.symbolize_keys_recursive(circular: :circular))
         data[:severity] =
           begin
             Severity.new((data[:severity] || :debug))
           rescue
             Severity.new(:debug)
           end
+        unless data.key?(:message)
+          data[:message] = "a #{data[:type]} type log message of severity #{data[:severity]}"
+        end
         @data = Hash[data.sort_by(&:first)]
       end
 
@@ -124,8 +105,8 @@ module Betterlog
 
       private
 
-      def meta
-        m = {
+      def compute_data(data)
+        d = data | {
           timestamp: Time.now.utc.iso8601(3),
           pid:       $$,
           program:   File.basename($0),
@@ -133,15 +114,12 @@ module Betterlog
           type:      'rails',
           facility:  'local0',
           host:      (Socket.gethostname rescue nil),
-          thread_id:  Thread.current.object_id
+          thread_id: Thread.current.object_id,
         }
-        if defined? GlobalMetadata
-          m |= GlobalMetadata.data
-        end
-        if defined? Sidekiq::Context.current
-          m |= Sidekiq::Context.current&.symbolize_keys_recursive
-        end
-        m
+        d[:meta] ||= {}
+        d[:meta] |= (GlobalMetadata.current |
+          (Sidekiq::Context.current&.symbolize_keys_recursive if defined?(Sidekiq::Context)))
+        d
       end
     end
   end

data/lib/betterlog/log.rb

@@ -26,7 +26,8 @@ module Betterlog
     # @return [ Log ] this object itself.
     def info(object, **rest)
       protect do
-        emit Log::Event.ify(object, severity: __method__, rest: rest)
+        rest = { severity: __method__ } | rest
+        emit Log::Event.ify(object, **rest)
       end
     end
 
@@ -37,7 +38,8 @@ module Betterlog
     # @return [ Log ] this object itself.
     def warn(object, **rest)
       protect do
-        emit Log::Event.ify(object, severity: __method__, rest: rest)
+        rest = { severity: __method__ } | rest
+        emit Log::Event.ify(object, **rest)
       end
     end
 
@@ -48,7 +50,8 @@ module Betterlog
     # @return [ Log ] this object itself.
     def debug(object, **rest)
       protect do
-        emit Log::Event.ify(object, severity: __method__, rest: rest)
+        rest = { severity: __method__ } | rest
+        emit Log::Event.ify(object, **rest)
       end
     end
 
@@ -59,7 +62,8 @@ module Betterlog
     # @return [ Log ] this object itself.
     def error(object, **rest)
       protect do
-        emit Log::Event.ify(object, severity: __method__, rest: rest)
+        rest = { severity: __method__ } | rest
+        emit Log::Event.ify(object, **rest)
       end
     end
 
@@ -70,7 +74,8 @@ module Betterlog
     # @return [ Log ] this object itself.
     def fatal(object, **rest)
       protect do
-        emit Log::Event.ify(object, severity: __method__, rest: rest)
+        rest = { severity: __method__ } | rest
+        emit Log::Event.ify(object, **rest)
       end
     end
 
@@ -82,51 +87,12 @@ module Betterlog
     # @return [ Log ] this object itself.
     def output(object, **rest)
       protect do
-        emit Log::Event.ify(object, severity: rest[:severity], rest: rest)
+        emit Log::Event.ify(object, **rest)
       end
     end
 
-    # Logs a metric on severity debug, by default, this can be changed by passing
-    # the severity: keyword. +name+ is for example 'Donation.Confirmation' and
-    # +value+ can be any value, but has to be somewhat consistent in terms of
-    # structure with +name+ to allow for correct
-    # evaluation.
-    #
-    # @param name the name of the recorded metric.
-    # @param value of the recorded metric, defaults to duration if block was given.
-    # @param success a Proc with parameter +result+ that returns true iff block
-    #        result was asuccessful
-    # @param **rest additional rest is logged as well.
-    # @return [ Log ] this object itself.
     def metric(name:, value: nil, success: -> result { true }, **rest, &block)
-      result = time_block(&block)
-    rescue => error
-      e = Log::Event.ify(error)
-      rest |= e.as_json.subhash(:error_class, :backtrace, :message)
-      rest[:message] = "#{rest[:message].inspect} while measuring metric #{name}"
-      raise error
-    ensure
-      protect do
-        if timed_duration
-          rest[:duration] = timed_duration
-        end
-        event = build_metric(
-          name:     name,
-          value:    value || timed_duration,
-          success: success.(result),
-          **rest
-        )
-        emit event
-      end
-    end
-
-    def context(data_hash)
-      GlobalMetadata.add data_hash
-      self
-    end
-
-    def self.context(data_hash)
-      instance.context(data_hash)
+      warn "#{self.class}##{__method__} is deprecated"
     end
 
     def emit(event)
@@ -140,8 +106,6 @@ module Betterlog
       notify(event)
       logger.send(event.severity.to_sym, JSON.generate(event))
       self
-    ensure
-      GlobalMetadata.data.clear
     end
 
     private
@@ -163,7 +127,6 @@ module Betterlog
     end
 
     def build_metric(name:, value:, **rest)
-      severity = rest.fetch(:severity, :info)
       rest |= {
         message: "a metric #{name}=#{value}",
       }
@@ -173,7 +136,6 @@ module Betterlog
           value: value,
           type: 'metric'
         } | rest,
-        severity: severity
       )
     end
 

data/lib/betterlog/log_event_formatter.rb

@@ -48,6 +48,7 @@ module Betterlog
     rescue => e
       Betterlog::Log.logger.error(e)
     ensure
+      message = message.to_s
       # Do not "message << ?\n" - A frozen string may be passed in
       message.end_with?(?\n) or message = "#{message}\n"
       return message

data/lib/betterlog/notifiers.rb

@@ -13,15 +13,17 @@ module Betterlog
     end
 
     def self.notify(event)
+      event.notify? or return
       notifiers.each do |notifier|
-        notifier.notify(event.notify?, event.as_json)
+        context(event.as_json)
+        notifier.notify(event[:message], event.as_json)
       end
     end
 
-    def self.context(data_hash)
+    def self.context(data)
       notifiers.each do |notifier|
         notifier.respond_to?(:context) or next
-        notifier.context(data_hash)
+        notifier.context(data)
       end
     end
   end

data/lib/betterlog/version.rb

@@ -1,6 +1,6 @@
 module Betterlog
   # Betterlog version
-  VERSION         = '1.1.1'
+  VERSION         = '2.0.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/spec/betterlog/global_metadata_spec.rb

@@ -1,6 +1,72 @@
 require 'spec_helper'
 
 describe Betterlog::GlobalMetadata do
+  describe '.add' do
+    it 'can add to context' do
+      expect(Betterlog::GlobalMetadata.current).to be_empty
+      Betterlog::GlobalMetadata.add(
+        'foo' => 'bar',
+      )
+      expect(Betterlog::GlobalMetadata.current).to eq(foo: 'bar')
+    end
+  end
+
+  describe '.remove' do
+    it 'can remove by hash' do
+      Betterlog::GlobalMetadata.add(
+        'foo' => 'bar',
+      )
+      expect(Betterlog::GlobalMetadata.current).to eq(foo: 'bar')
+      Betterlog::GlobalMetadata.remove(
+        'foo' => 'bar',
+      )
+      expect(Betterlog::GlobalMetadata.current).to be_empty
+    end
+
+    it 'can remove by array' do
+      Betterlog::GlobalMetadata.add(
+        'foo' => 'bar',
+      )
+      expect(Betterlog::GlobalMetadata.current).to eq(foo: 'bar')
+      Betterlog::GlobalMetadata.remove(%i[ foo ])
+      expect(Betterlog::GlobalMetadata.current).to be_empty
+    end
+  end
+
+  describe '.with_context' do
+    it 'can add to context and remove it' do
+      expect(Betterlog::GlobalMetadata.current).to be_empty
+      Betterlog::GlobalMetadata.with_context(
+        'foo' => 'bar',
+        :bar  => 'foo',
+      ) do |my_context|
+        expect(Betterlog::GlobalMetadata.current).to eq(foo: 'bar', bar: 'foo')
+        expect(my_context).to eq(foo: 'bar', bar: 'foo')
+        expect(my_context).to be_frozen
+      end
+      expect(Betterlog::GlobalMetadata.current).to be_empty
+    end
+
+    it 'can add to nested context and remove it' do
+      expect(Betterlog::GlobalMetadata.current).to be_empty
+      Betterlog::GlobalMetadata.with_context(
+        'foo' => 'bar',
+        :bar  => 'foo',
+      ) do |my_context|
+        expect(Betterlog::GlobalMetadata.current).to eq(foo: 'bar', bar: 'foo')
+        expect(my_context).to eq(foo: 'bar', bar: 'foo')
+        expect(my_context).to be_frozen
+        Betterlog::GlobalMetadata.with_context('quux' => 'quark') do |my_context|
+          expect(my_context).to be_frozen
+          expect(Betterlog::GlobalMetadata.current).to eq(foo: 'bar', bar: 'foo', quux: 'quark')
+          expect(my_context).to eq(foo: 'bar', bar: 'foo', quux: 'quark')
+        end
+        expect(my_context).to eq(foo: 'bar', bar: 'foo')
+      end
+      expect(Betterlog::GlobalMetadata.current).to be_empty
+    end
+  end
+
   class FakeNotifierClass
     def notify(message, hash) end
 
@@ -16,25 +82,15 @@ describe Betterlog::GlobalMetadata do
     example.run
   ensure
     Betterlog::Notifiers.notifiers.clear
-    described_class.data.clear
+    described_class.current.clear
   end
 
   it 'can haz empty data' do
-    expect(described_class.data).to eq({})
+    expect(described_class.current).to eq({})
   end
 
   it 'can haz some data' do
-    described_class.data |= { foo: 'bar' }
-    expect(described_class.data).to eq({ foo: 'bar' })
-  end
-
-  it 'can "add" data' do
-    expect_any_instance_of(FakeNotifierClass).to receive(:context).with(foo: 'bar')
-    expect(described_class.add(foo: 'bar')).to eq described_class.instance
-  end
-
-  it 'can "add" data via Log.context' do
-    expect_any_instance_of(FakeNotifierClass).to receive(:context).with(foo: 'bar')
-    Betterlog::Log.context(foo: 'bar')
+    described_class.current |= { foo: 'bar' }
+    expect(described_class.current).to eq({ foo: 'bar' })
   end
 end

data/spec/betterlog/log_spec.rb

@@ -78,6 +78,8 @@ describe Betterlog::Log do
     let :notifier do
       Class.new do
         def notify(message, hash) end
+
+        def context(data) end
       end.new
     end
 
@@ -103,9 +105,19 @@ describe Betterlog::Log do
     it 'can send explicit notifications with additional hash values' do
       expect(notifier).to receive(:notify).with(
         'test',
-        hash_including(message: 'test', foo: 'bar')
+        hash_including(meta: { foo: 'bar' }),
       )
-      Log.info({ message: 'test', foo: 'bar' }, notify: true)
+      Log.info({ message: 'test', meta: { foo: 'bar' } }, notify: true)
+    end
+
+    it 'can send notifications with additional hash values for context' do
+      expect(notifier).to receive(:notify).with(
+        'test',
+        hash_including(meta: { foo: 'bar' }),
+      )
+      Betterlog::GlobalMetadata.with_context(foo: 'bar') do
+        Log.info('test', notify: true)
+      end
     end
 
     it 'can send explicit notifications for exceptions' do
@@ -147,103 +159,4 @@ describe Betterlog::Log do
       Log.error(exception, foo: 'bar')
     end
   end
-
-  describe '#metric' do
-    after do
-      Time.dummy = nil
-    end
-
-    it 'logs metrics with a specific structure on info log level' do
-      expected_event = Log::Event.new(
-        message:  'a metric controller.action=0.123',
-        name:     'controller.action',
-        value:    0.123,
-        success:  true,
-        type:     'metric',
-        severity: 'info'
-      )
-      expect(instance).to receive(:emit).with(expected_event)
-      Log.metric(name: 'controller.action', value: 0.123)
-    end
-
-    it 'logs metrics on a given log level' do
-      expected_event = Log::Event.new(
-        message:  'a metric controller.action=0.123',
-        name:     'controller.action',
-        value:    0.123,
-        success:  true,
-        type:     'metric',
-        severity: :info,
-      )
-      expect(instance).to receive(:emit).with(expected_event)
-      Log.metric(severity: :info, name: 'controller.action', value: 0.123)
-    end
-
-    it 'logs metrics with additional data' do
-      expected_event = Log::Event.new(
-        message:  'a metric controller.action=0.123',
-        foo:      'bar',
-        name:     'controller.action',
-        value:    0.123,
-        success:  true,
-        type:     'metric',
-        severity: 'info'
-      )
-      expect(instance).to receive(:emit).with(expected_event)
-      Log.metric(name: 'controller.action', value: 0.123, foo: 'bar')
-    end
-
-    it 'can be sent after measuring times' do
-      expected_event = Log::Event.new(
-        message:   'a metric foo=10.0',
-        name:      'foo',
-        value:     10.0,
-        success:   true,
-        duration:  10.0,
-        timestamp: "2011-11-11T10:11:21.000Z",
-        type:      'metric',
-        severity:  'info'
-      )
-      expect(instance).to receive(:emit).with(expected_event)
-      Log.metric(name: 'foo', success: -> result { result == :success }) do
-        Time.dummy = Time.now + 10
-        :success
-      end
-    end
-
-    class MyEx < StandardError
-      def backtrace
-        %w[ backtrace ]
-      end
-    end
-
-    it 'adds exception information if block raises' do
-      expected_event = Log::Event.new(
-        name:       'foo',
-        value:       3.0,
-        success:     false,
-        duration:    3.0,
-        timestamp:   "2011-11-11T10:11:14.000Z",
-        message:     '"MyEx: we were fucked" while measuring metric foo',
-        error_class: 'MyEx',
-        backtrace:   %w[ backtrace ],
-        type:        'metric',
-        severity:    'info'
-      )
-      expect(instance).to receive(:emit).with(expected_event)
-      raised = false
-      begin
-        Log.metric(name: 'foo', success: -> result { result == :success }) do
-          Time.dummy = Time.now + 3
-          raise MyEx, "we were fucked"
-          Time.dummy = Time.now + 7
-          :success
-        end
-      rescue MyEx
-        raised = true
-      end
-      expect(raised).to eq true
-    end
-
-  end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ if ENV['START_SIMPLECOV'].to_i == 1
 end
 require 'rspec'
 begin
-  require 'byebug'
+  require 'debug'
 rescue LoadError
 end
 require 'betterlog'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betterlog
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - betterplace Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-16 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: all_images
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +216,7 @@ extra_rdoc_files:
 - lib/betterlog/railtie.rb
 - lib/betterlog/version.rb
 files:
+- ".all_images.yml"
 - ".github/workflows/codeql-analysis.yml"
 - ".gitignore"
 - ".semaphore/semaphore.yml"
@@ -239,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.25
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Structured logging support for bp