lorekeeper 2.5.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b28b160e67e8d9321eebfb99ba3ade77f7409633ae3977b43abe5cdcdf62cb15
-  data.tar.gz: d2446915f9a3dd36ce5051316557816b884b33ea7ebbb3a3eeac8cb96ce528fc
+  metadata.gz: b6d72806736892898e7cd27786d25a37e4569f8e7f1562b3097ddb614324cf1a
+  data.tar.gz: 1102556da650a22b1b30b177150a2d64a4eaa9d7d05697eaf3498db0af2a6915
 SHA512:
-  metadata.gz: 23d9b597ad2cc8cd4a5bc411f63a70f30930c066289aa17258319ddb8e9fdd68f092d8706ace0f5ce468e4ebfe4c8037b67007cb7e3accdf4489f11c6647dc11
-  data.tar.gz: 482721d054b7631906058eacf6c07db16235964ab7cf658e49ba92e8ed979beb05223240284d72267fe694aec6e66a576769bb862bfeba9d9f8ccf834e8d8187
+  metadata.gz: a430d1ce3d1865df5223c9790c0129464eb88a20b9872d689a6b6180a9c7bc89594d07950e8ad0eac4c9834a97cb144c7f0a1e43d9dd635bd7c8d0a2e3dad016
+  data.tar.gz: f8793ed6d04b6ce8ec649b3feebd843e57eafef32eadf0c56e94a0ec310455c81a75119ab1176e86536ead7439adc6f684164ed36762d9edaef5c3d89ef7f66c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.6.1
+* Fix Lorekeeper::BacktraceCleaner#clean to not raise when a non-array value is passed
+
+# 2.6.0
+* Expose Lorekeeper::BacktraceCleaner
+
 # 2.5.0
 * Update the backtrace cleaner in JSONLogger to remove web server and stdlib lines, and to strip the Rails.root prefix
 

data/README.md

@@ -10,7 +10,7 @@ When used without extra fields it outputs 20% faster than the standard Logger fo
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'lorekeeper', '~> 1.7'
+gem 'lorekeeper', '~> 2.0'
 ```
 
 And then execute:
@@ -210,6 +210,14 @@ end
 ```
 
 
+### Backtrace Cleaner
+
+The backtrace cleaner can be used independently:
+
+```ruby
+Lorekeeper::BacktraceCleaner.instance.clean(backtrace)
+```
+
 
 ## License
 

data/lib/lorekeeper/backtrace_cleaner.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'singleton'
+
+module Lorekeeper
+  class BacktraceCleaner
+    include Singleton
+
+    def initialize
+      @backtrace_cleaner = set_backtrace_cleaner
+      @rails_root = defined?(Rails.root) ? Rails.root.to_s : nil
+      @rails_root_size = @rails_root.to_s.size
+      @gem_path = defined?(Gem.path) ? Gem.path : []
+      @denylisted_fingerprint = denylisted_fingerprint
+    end
+
+    def clean(backtrace)
+      return [] unless backtrace.is_a?(Array)
+
+      backtrace = filter_rails_root_backtrace(backtrace)
+      @backtrace_cleaner&.clean(backtrace) || backtrace
+    end
+
+    private
+
+    DENYLISTED_FINGERPRINT =
+      %r{newrelic_rpm|active_support/callbacks.rb|zipkin-tracer|puma|phusion_passenger|opentelemetry}.freeze
+
+    def denylisted_fingerprint
+      return DENYLISTED_FINGERPRINT unless ENV.key?('LOREKEEPER_DENYLIST')
+
+      /#{ENV.fetch('LOREKEEPER_DENYLIST').split(',').map(&:strip).join('|')}/
+    end
+
+    def filter_rails_root_backtrace(backtrace)
+      return backtrace unless @rails_root
+
+      last_index = nil
+      result = []
+      backtrace.each_with_index do |line, idx|
+        if line.start_with?(@rails_root) && @gem_path.none? { |path| line.start_with?(path) }
+          result << line[@rails_root_size..]
+          last_index = idx
+        else
+          result << line
+        end
+      end
+
+      last_index ? result[..last_index] : result
+    end
+
+    def set_backtrace_cleaner
+      return nil unless defined?(ActiveSupport::BacktraceCleaner)
+
+      cleaner = ActiveSupport::BacktraceCleaner.new
+      cleaner.remove_silencers!
+      cleaner.add_silencer do |line|
+        line.match?(@denylisted_fingerprint) || line.start_with?(RbConfig::CONFIG['rubylibdir'])
+      end
+      cleaner
+    end
+  end
+end

data/lib/lorekeeper/json_logger.rb

@@ -9,11 +9,6 @@ module Lorekeeper
     def initialize(file)
       reset_state
       @base_fields = { TIMESTAMP => '', MESSAGE => '', LEVEL => '' }
-      @backtrace_cleaner = set_backtrace_cleaner
-      @rails_root = defined?(Rails.root) ? Rails.root.to_s : nil
-      @rails_root_size = @rails_root.to_s.size
-      @gem_path = defined?(Gem.path) ? Gem.path : []
-      @denylisted_fingerprint = denylisted_fingerprint
 
       super(file)
     end
@@ -121,36 +116,7 @@ module Lorekeeper
     # Cleaner defaults to newrelic, active_support/callbacks, zipkin-tracer, opentelemetry, web servers,
     # and stdlib now but can be configured by using LOREKEEPER_DENYLIST env var.
     def clean_backtrace(backtrace)
-      backtrace = filter_rails_root_backtrace(backtrace)
-      @backtrace_cleaner&.clean(backtrace) || backtrace
-    end
-
-    def filter_rails_root_backtrace(backtrace)
-      return backtrace unless @rails_root
-
-      last_index = nil
-      result = []
-      backtrace.each_with_index do |line, idx|
-        if line.start_with?(@rails_root) && @gem_path.none? { |path| line.start_with?(path) }
-          result << line[@rails_root_size..]
-          last_index = idx
-        else
-          result << line
-        end
-      end
-
-      last_index ? result[..last_index] : result
-    end
-
-    def set_backtrace_cleaner
-      return nil unless defined?(ActiveSupport::BacktraceCleaner)
-
-      cleaner = ActiveSupport::BacktraceCleaner.new
-      cleaner.remove_silencers!
-      cleaner.add_silencer do |line|
-        line.match?(@denylisted_fingerprint) || line.start_with?(RbConfig::CONFIG['rubylibdir'])
-      end
-      cleaner
+      Lorekeeper::BacktraceCleaner.instance.clean(backtrace)
     end
 
     THREAD_KEY = 'lorekeeper_jsonlogger_key' # Shared by all threads but unique by thread
@@ -161,14 +127,6 @@ module Lorekeeper
     EXCEPTION = 'exception'
     STACK = 'stack'
     DATA = 'data'
-    DENYLISTED_FINGERPRINT =
-      %r{newrelic_rpm|active_support/callbacks.rb|zipkin-tracer|puma|phusion_passenger|opentelemetry}.freeze
-
-    def denylisted_fingerprint
-      return DENYLISTED_FINGERPRINT unless ENV.key?('LOREKEEPER_DENYLIST')
-
-      /#{ENV.fetch('LOREKEEPER_DENYLIST').split(',').map(&:strip).join('|')}/
-    end
 
     def with_extra_fields(fields)
       state[:extra_fields] = fields

data/lib/lorekeeper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lorekeeper
-  VERSION = '2.5.0'
+  VERSION = '2.6.1'
 end

data/lib/lorekeeper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'lorekeeper/version'
+require 'lorekeeper/backtrace_cleaner'
 require 'lorekeeper/fast_logger'
 require 'lorekeeper/simple_logger'
 require 'lorekeeper/json_logger'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lorekeeper
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Jordi Polo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -223,6 +223,7 @@ files:
 - bin/console
 - bin/setup
 - lib/lorekeeper.rb
+- lib/lorekeeper/backtrace_cleaner.rb
 - lib/lorekeeper/fast_logger.rb
 - lib/lorekeeper/json_logger.rb
 - lib/lorekeeper/multi_logger.rb