lorekeeper 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 20607700d6213a2dbeaa828a691db22d62c8faf4
-  data.tar.gz: ea7a417e437eec8f98699cba4c9a8c56db56facd
+SHA256:
+  metadata.gz: d211ca03f7364fb674acbd2b0b8916dc1406efcb5299007fe203e3d594348fce
+  data.tar.gz: 0caccf6617f49aa5d37ad9bad1c81d9256717dff0967b1144eefaaeae233a4df
 SHA512:
-  metadata.gz: cda5c319cb5f3baa40c949e07fc4f25ac34acbb349af2c1b08a336e192f55da0faecd9b1a4c19cf24d1a5361141a5731c8670835dfe935432c27f41d052fe300
-  data.tar.gz: 2751f693aa13f17d287e189c1425c4ef2ed4879ba3b2074aea74e18e11c2391f4118ec59c7bc2e61a67fb0152fa312ff394081c1fc0cf49c55d6cddf28010fad
+  metadata.gz: 6a17d81d686474f260955cdf7cdcd5a89ec664dd64d5781549002d69359e27d3a4ea34614d113847f4a657cd1208c3bf7832fef6af8a99155f2176e4bc7442ae
+  data.tar.gz: 2a06e800054576f0eae66bbf19d6a016c744ef52c7ca0ca5aef63b25dd78e1f0ff10caea743acd2e370f080b6c5b2e147ef8235dbefd19909122c916f644e502

data/.travis.yml

@@ -2,14 +2,8 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
-
-before_install:
-  - gem install rubygems-update -v 2.7.8
-  - gem install bundler -v 1.17.3
-  - bundle --version
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
 
 script: bundle exec rspec

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.10.0
+* Use ActiveSupport::BacktraceCleaner to reduce noise in stacktrace output
+
 # 1.9.0
 * Remove Newrelic instrumentation information from stacktrace output
 

data/lib/lorekeeper/json_logger.rb

@@ -9,6 +9,7 @@ module Lorekeeper
     def initialize(file)
       reset_state
       @base_fields = { MESSAGE => '', TIMESTAMP => '', LEVEL => '' }
+      @backtrace_cleaner = set_backtrace_cleaner
       super(file)
     end
 
@@ -97,11 +98,19 @@ module Lorekeeper
 
     # Some instrumentation libraries pollute the stacktrace and create a large output which may
     # cause problems with certain logging backends.
-    # Hardcoring newrelic now here. In the future if this list grows, we may make it configurable.
+    # Hardcording newrelic and active_support/callbacks now here.
+    # In the future if this list grows, we may make it configurable.
     def clean_backtrace(backtrace)
-      backtrace.reject do |line|
-        line.include?(BLACKLISTED_FINGERPRINT)
-      end
+      @backtrace_cleaner&.clean(backtrace) || backtrace
+    end
+
+    def set_backtrace_cleaner
+      return nil unless defined?(ActiveSupport::BacktraceCleaner)
+
+      cleaner = ActiveSupport::BacktraceCleaner.new
+      cleaner.remove_silencers!
+      cleaner.add_silencer { |line| line.match?(BLACKLISTED_FINGERPRINT) }
+      cleaner
     end
 
     THREAD_KEY = 'lorekeeper_jsonlogger_key' # Shared by all threads but unique by thread
@@ -112,7 +121,7 @@ module Lorekeeper
     EXCEPTION = 'exception'
     STACK = 'stack'
     DATA = 'data'
-    BLACKLISTED_FINGERPRINT = '/newrelic_rpm-'
+    BLACKLISTED_FINGERPRINT = %r{newrelic_rpm|active_support/callbacks.rb}.freeze
 
     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 = '1.9.0'
+  VERSION = '1.10.0'
 end

data/lorekeeper.gemspec

@@ -20,10 +20,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '>= 2.4.0'
 
   spec.add_dependency 'oj', '>= 3.4', '< 4.0'
 
+  spec.add_development_dependency 'activesupport', '>= 4.0'
   spec.add_development_dependency 'bundler', '>= 1.16', '< 3.0'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lorekeeper
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Jordi Polo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-07 00:00:00.000000000 Z
+date: 2019-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -199,15 +213,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Very fast JSON logger