betterlog 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a14afeaf9f071dd35f0ba6fa5ae5a7052e71ea80e6872ef1f00245afcea15164
-  data.tar.gz: 1da4a6ab2c4ca3e79bf466dfe06a0d1ac786c8660f89b5dcda47ec5c9052b34d
+  metadata.gz: c1cf962b9cfc91342bd36a4cda723361b67c6b0356242d6614c2c5feb7f53bfa
+  data.tar.gz: f364e9791ba336bf6757584c8afd2d46ed9e81afc0383fb398a88b5bbde9bd2d
 SHA512:
-  metadata.gz: 234235247f8b69eb8d67f9b4c9d24dc6e632ae567b1f4708f52a2d05fe3b4af11f9a726798af60f5c01615816c1cf1420a47dfbd6607f7a20a84f1b250e65429
-  data.tar.gz: 0bb91c78f26c795c108a462fbe4e1fbf305fa335eddfa92ebc270f587263dd952e6728d4bf615de73bf0a2144f0b07b627481d4d27fff1dc6206080db03ec8d0
+  metadata.gz: 8e828c8de110ada030616ed5fc3bff0c02875e9bf7544bd9a41a4d8814fc8927347ceae531283273ff78abf786ba60ef2d398e6aa273b9014dc49e7f5eaf6832
+  data.tar.gz: 190114f48d8662d9f7203740a843bd5e57940cf0a2292f522d643e4eb10c13e5e2581d51d2cbe4d6ac0227d1c578b1a265b2c1e3fffea13db5049dcf384bb4dc

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.3

data/betterlog.gemspec

@@ -1,19 +1,19 @@
 # -*- encoding: utf-8 -*-
-# stub: betterlog 2.0.1 ruby lib
+# stub: betterlog 2.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "betterlog".freeze
-  s.version = "2.0.1"
+  s.version = "2.0.3"
 
   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-17"
+  s.date = "2024-03-13"
   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 = [".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.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/legacy_event_formatter.rb".freeze, "lib/betterlog/log/severity.rb".freeze, "lib/betterlog/notifiers.rb".freeze, "lib/betterlog/railtie.rb".freeze, "lib/betterlog/version.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/legacy_event_formatter.rb".freeze, "lib/betterlog/log/severity.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.26".freeze

data/lib/betterlog/global_metadata.rb

@@ -22,7 +22,7 @@ module Betterlog
 
     def with_meta(data = {}, &block)
       add data
-      block.call(current.dup.freeze)
+      block.call
     ensure
       remove data
     end

data/lib/betterlog/log/legacy_event_formatter.rb

@@ -0,0 +1,56 @@
+require 'term/ansicolor'
+
+module Betterlog
+  class Log
+    class LegacyEventFormatter < ::ActiveSupport::Logger::Formatter
+      include ActiveSupport::TaggedLogging::Formatter
+      include ComplexConfig::Provider::Shortcuts
+
+      def emitter
+        'legacy'
+      end
+
+      def call(severity, timestamp, program, message)
+        if cc.log.legacy_supported
+          if message.blank?
+            message = ''
+          elsif !Log::Event.is?(message)
+
+            m = message.to_s
+            m = Term::ANSIColor.uncolor(m)
+            m = m.sub(/\s+$/, '')
+
+            timestamp = timestamp.utc.iso8601(3)
+            event = Log::Event.new(
+              emitter:    emitter,
+              timestamp:  timestamp,
+              message:    m,
+              severity:   severity.to_s.downcase,
+              # tags:       current_tags,
+            )
+            backtrace = m.scan(/^\s*(?:[^:]+):(?:\d+).*$/)
+            if backtrace.size > 1
+              event[:backtrace] = backtrace.map { |b| b.sub(/\s+$/, '') }
+              event[:message] = "#{backtrace.first}\n"
+            end
+            if l = caller_locations.reverse_each.each_cons(2).find { |c, n|
+              n.absolute_path =~ /\/lib\/ruby\/.*?\/logger\.rb/ and break c
+            }
+              then
+              event[:location] = [ l.absolute_path, l.lineno ] * ?:
+            end
+            program and event[:program] = program
+            message = JSON.generate(event)
+          end
+        end
+      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
+      end
+    end
+  end
+end

data/lib/betterlog/railtie.rb

@@ -1,8 +1,8 @@
 module Betterlog
   class Railtie < Rails::Railtie
     initializer "betterlog_railtie.configure_rails_initialization" do
-      require 'betterlog/log_event_formatter'
-      Rails.logger.formatter = Betterlog::LogEventFormatter.new
+      require 'betterlog/log/legacy_event_formatter'
+      Rails.logger.formatter = Betterlog::Log::LegacyEventFormatter.new
     end
   end
 end

data/lib/betterlog/version.rb

@@ -1,6 +1,6 @@
 module Betterlog
   # Betterlog version
-  VERSION         = '2.0.1'
+  VERSION         = '2.0.3'
   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

@@ -39,10 +39,8 @@ describe Betterlog::GlobalMetadata do
       Betterlog::GlobalMetadata.with_meta(
         'foo' => 'bar',
         :bar  => 'foo',
-      ) do |my_context|
+      ) do
         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
@@ -52,16 +50,11 @@ describe Betterlog::GlobalMetadata do
       Betterlog::GlobalMetadata.with_meta(
         'foo' => 'bar',
         :bar  => 'foo',
-      ) do |my_context|
+      ) do
         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_meta('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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betterlog
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - betterplace Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -210,8 +210,8 @@ extra_rdoc_files:
 - lib/betterlog/log.rb
 - lib/betterlog/log/event.rb
 - lib/betterlog/log/event_formatter.rb
+- lib/betterlog/log/legacy_event_formatter.rb
 - lib/betterlog/log/severity.rb
-- lib/betterlog/log_event_formatter.rb
 - lib/betterlog/notifiers.rb
 - lib/betterlog/railtie.rb
 - lib/betterlog/version.rb
@@ -234,8 +234,8 @@ files:
 - lib/betterlog/log.rb
 - lib/betterlog/log/event.rb
 - lib/betterlog/log/event_formatter.rb
+- lib/betterlog/log/legacy_event_formatter.rb
 - lib/betterlog/log/severity.rb
-- lib/betterlog/log_event_formatter.rb
 - lib/betterlog/notifiers.rb
 - lib/betterlog/railtie.rb
 - lib/betterlog/version.rb

data/lib/betterlog/log_event_formatter.rb

@@ -1,57 +0,0 @@
-require 'term/ansicolor'
-
-module Betterlog
-  class LogEventFormatter < ActiveSupport::Logger::Formatter
-    include ActiveSupport::TaggedLogging::Formatter
-    include ComplexConfig::Provider::Shortcuts
-
-    def emitter
-      'legacy'
-    end
-
-    def call(severity, timestamp, program, message)
-      if cc.log.legacy_supported
-        if message.blank?
-          message = ''
-        elsif !Log::Event.is?(message)
-
-          m = message.to_s
-          m = Term::ANSIColor.uncolor(m)
-          m = m.sub(/\s+$/, '')
-
-          timestamp = timestamp.utc.iso8601(3)
-          event = Log::Event.new({
-            emitter:    emitter,
-            timestamp:  timestamp,
-            message:    m,
-            severity:   severity.to_s.downcase,
-            # tags:       current_tags,
-            meta: (
-              Sidekiq::Context.current&.symbolize_keys_recursive if defined?(Sidekiq::Context.current)
-            )}.compact
-          )
-          backtrace = m.scan(/^\s*(?:[^:]+):(?:\d+).*$/)
-          if backtrace.size > 1
-            event[:backtrace] = backtrace.map { |b| b.sub(/\s+$/, '') }
-            event[:message] = "#{backtrace.first}\n"
-          end
-          if l = caller_locations.reverse_each.each_cons(2).find { |c, n|
-               n.absolute_path =~ /\/lib\/ruby\/.*?\/logger\.rb/ and break c
-            }
-          then
-            event[:location] = [ l.absolute_path, l.lineno ] * ?:
-          end
-          program and event[:program] = program
-          message = JSON.generate(event)
-        end
-      end
-    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
-    end
-  end
-end