betterlog 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c916f2cfc831f6a3ca23ab03b861dacb4f9e48af67a67f336e2bd9a2aa7412f6
-  data.tar.gz: faa732b45a4e18bdcd143073bf991c57490b64cd38402e3a90bfc1c908ed8aa3
+  metadata.gz: 987b3368052755a7e84522c231993f9737a98330a9ee4e193e5b53db6f6e01eb
+  data.tar.gz: 1bc108b719cd139209d402a51f1429b27823cf2f1bb9477570f74e2bafab8379
 SHA512:
-  metadata.gz: 0cd114b7cbd2a74cb45475f92b4066c819a8430f68faa18096f0fe155d1fb8792901925489df3c0550c29e38a84b69068df3f08f52c3095ff2397ccc116fe65c
-  data.tar.gz: caab1d2b2522e794ea9a419c7cd6a643fdd1bbb76c7b2c696c0b94910da475aa839098fb58a5e752fb0f27a5b2e7b8db1e3660ee0bef8b32ff3f2c60473b9f42
+  metadata.gz: 1f6775a9473ae394dc61f648c645615efa905281727613b95fc39f20b702be32b4c1dc27aa312bd0936926785077ebc03917c4a7da29a73956f2576a4463fb84
+  data.tar.gz: 0e877168113e76a2165f20c42b7197d72db9085280e2dcbfc06ba5822fb9b97653554497a9c59f89d0ab9196746e8166b4b7bd31014d95d624678b46294ad360

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.4

data/betterlog.gemspec

@@ -1,38 +1,56 @@
 # -*- encoding: utf-8 -*-
-# stub: betterlog 2.0.2 ruby lib
+# stub: betterlog 2.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "betterlog".freeze
-  s.version = "2.0.2".freeze
+  s.version = "2.0.4"
 
   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 = "2024-01-25"
+  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/legacy_event_formatter_spec.rb".freeze, "spec/betterlog/log/severity_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.5.5".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]
+  s.test_files = ["spec/betterlog/global_metadata_spec.rb".freeze, "spec/betterlog/log/event_spec.rb".freeze, "spec/betterlog/log/legacy_event_formatter_spec.rb".freeze, "spec/betterlog/log/severity_spec.rb".freeze, "spec/betterlog/log_spec.rb".freeze, "spec/betterlog/version_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
-  s.specification_version = 4
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+  end
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.12.0".freeze])
-  s.add_development_dependency(%q<rake>.freeze, [">= 0".freeze])
-  s.add_development_dependency(%q<rspec>.freeze, [">= 0".freeze])
-  s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
-  s.add_development_dependency(%q<debug>.freeze, [">= 0".freeze])
-  s.add_development_dependency(%q<all_images>.freeze, [">= 0".freeze])
-  s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.3".freeze, ">= 1.22.0".freeze])
-  s.add_runtime_dependency(%q<complex_config>.freeze, [">= 0".freeze])
-  s.add_runtime_dependency(%q<file-tail>.freeze, ["~> 1.0".freeze])
-  s.add_runtime_dependency(%q<json>.freeze, ["~> 2.0".freeze])
-  s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.3".freeze])
-  s.add_runtime_dependency(%q<redlock>.freeze, [">= 0".freeze])
-  s.add_runtime_dependency(%q<excon>.freeze, [">= 0".freeze])
+  if s.respond_to? :add_runtime_dependency then
+    s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.12.0"])
+    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"])
+    s.add_runtime_dependency(%q<json>.freeze, ["~> 2.0"])
+    s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.3"])
+    s.add_runtime_dependency(%q<redlock>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<excon>.freeze, [">= 0"])
+  else
+    s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.12.0"])
+    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"])
+    s.add_dependency(%q<json>.freeze, ["~> 2.0"])
+    s.add_dependency(%q<term-ansicolor>.freeze, ["~> 1.3"])
+    s.add_dependency(%q<redlock>.freeze, [">= 0"])
+    s.add_dependency(%q<excon>.freeze, [">= 0"])
+  end
 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.2'
+  VERSION         = '2.0.4'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/spec/betterlog/{log_event_formatter_spec.rb → log/legacy_event_formatter_spec.rb}

@@ -12,9 +12,9 @@ module ActiveSupport
     end
   end
 end
-require 'betterlog/log_event_formatter'
+require 'betterlog/log/legacy_event_formatter'
 
-describe Betterlog::LogEventFormatter do
+describe Betterlog::Log::LegacyEventFormatter do
   let :red do
     Term::ANSIColor.red { "red" }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betterlog
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - betterplace Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-25 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,15 +234,15 @@ 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
 - spec/betterlog/global_metadata_spec.rb
 - spec/betterlog/log/event_spec.rb
+- spec/betterlog/log/legacy_event_formatter_spec.rb
 - spec/betterlog/log/severity_spec.rb
-- spec/betterlog/log_event_formatter_spec.rb
 - spec/betterlog/log_spec.rb
 - spec/betterlog/version_spec.rb
 - spec/spec_helper.rb
@@ -268,15 +268,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.5
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Structured logging support for bp
 test_files:
 - spec/betterlog/global_metadata_spec.rb
 - spec/betterlog/log/event_spec.rb
+- spec/betterlog/log/legacy_event_formatter_spec.rb
 - spec/betterlog/log/severity_spec.rb
-- spec/betterlog/log_event_formatter_spec.rb
 - spec/betterlog/log_spec.rb
 - spec/betterlog/version_spec.rb
 - spec/spec_helper.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