betterlog 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 899c93328c9c225bb2611b62d1d8dcf981cfef0ab476a94a5bcc1024a893d4f4
-  data.tar.gz: 462aa3526876d4fcdc0bb5107261840bcebfed4eed423b8a76d9bab4514a2469
+  metadata.gz: 9dd0b86a27bcfa9be03314d034c5769db0b5aa4c871d101f5dc372605473013c
+  data.tar.gz: 9b939b15113a229abc71de6d75c1df3f1dd52745c94969299b511d532bbda81e
 SHA512:
-  metadata.gz: 50249915c7d17fab617bb8e1c207e854840f355cb7a5ecc5a2ee4602424bfa32f2b32b43c1149e446c221108f14d3dda5c6585024a78819bbe639a357af1a19b
-  data.tar.gz: 6e34ab32fa4d1dbb1cf93ce83b59f6a29bf78c018a5de8a98c8e3311c0d910c93c185fc7e9625369c10d2b3084c218b64a3a83e0602516bad8feff9032b0d76c
+  metadata.gz: c06fcf1d1734a6948dc67af44038e1da6497668e19ca744f011a953e55e921767cccae50668f03519cb7fba0ace4870a06b6ba04769cb4193dd244556ff72b98
+  data.tar.gz: 79965033190f63db5fa63e9e23923252c293a551fe700fc9de51ce07fa61e73e8849d6bec36906bc575c66e574cfc429d1c7ae1ceb4e6fe68717b960479eea31

data/.semaphore/semaphore.yml

@@ -3,7 +3,7 @@ name: Betterlog pipeline
 agent:
   machine:
     type: e1-standard-2
-    os_image: ubuntu1804
+    os_image: ubuntu2004
 
 blocks:
   - name: Caching
@@ -14,7 +14,7 @@ blocks:
       jobs:
         - name: cache bundle
           commands:
-            - sem-version ruby 2.7.2
+            - sem-version ruby $(awk '/^ruby/ { print $2 }' .tool-versions)
             - cache restore gems-$SEMAPHORE_GIT_BRANCH,gems-master
             - bundle config set path 'vendor/bundle'
             - bundle config jobs $(getconf _NPROCESSORS_ONLN)
@@ -31,7 +31,7 @@ blocks:
           - checkout
 
           # Setup ruby
-          - sem-version ruby 2.7.2
+          - sem-version ruby $(awk '/^ruby/ { print $2 }' .tool-versions)
 
           # Setup gems
           - cache restore gems-$SEMAPHORE_GIT_BRANCH,gems-master
@@ -60,4 +60,4 @@ blocks:
         - name: Building and pushing
           commands:
             - make build
-            - test "$SEMAPHORE_GIT_BRANCH" = "master" && make push-latest
+            - test "$SEMAPHORE_GIT_BRANCH" = "master" && make push-latest || true

data/.tool-versions

@@ -1,2 +1,3 @@
-golang 1.16
 ruby 3.0.2
+bundler 2.2.26
+golang 1.17

data/VERSION

@@ -1 +1 @@
-0.19.0
+0.20.0

data/betterlog.gemspec

@@ -1,24 +1,24 @@
 # -*- encoding: utf-8 -*-
-# stub: betterlog 0.19.0 ruby lib
+# stub: betterlog 0.20.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "betterlog".freeze
-  s.version = "0.19.0"
+  s.version = "0.20.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 = "2021-09-21"
+  s.date = "2021-10-26"
   s.description = "This library provides structure json logging for our rails projects".freeze
   s.email = "developers@betterplace.org".freeze
   s.executables = ["betterlog".freeze, "betterlog_pusher".freeze, "betterlog_sink".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/logger.rb".freeze, "lib/betterlog/notifiers.rb".freeze, "lib/betterlog/railtie.rb".freeze, "lib/betterlog/version.rb".freeze]
-  s.files = [".gitignore".freeze, ".semaphore/semaphore.yml".freeze, ".tool-versions".freeze, "Dockerfile".freeze, "Gemfile".freeze, "LICENSE".freeze, "Makefile".freeze, "README.md".freeze, "Rakefile".freeze, "TODO.md".freeze, "VERSION".freeze, "betterlog.gemspec".freeze, "betterlog/config.go".freeze, "betterlog/healthz.go".freeze, "betterlog/redis_cert_cache.go".freeze, "bin/betterlog".freeze, "bin/betterlog_pusher".freeze, "bin/betterlog_sink".freeze, "cloudbuild.yaml".freeze, "cmd/betterlog-server/LICENSE".freeze, "cmd/betterlog-server/main.go".freeze, "config/log.yml".freeze, "go.mod".freeze, "go.sum".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/logger.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_spec.rb".freeze, "spec/betterlog/logger_spec.rb".freeze, "spec/spec_helper.rb".freeze]
+  s.files = [".gitignore".freeze, ".semaphore/semaphore.yml".freeze, ".tool-versions".freeze, "Dockerfile".freeze, "Gemfile".freeze, "LICENSE".freeze, "Makefile".freeze, "README.md".freeze, "Rakefile".freeze, "TODO.md".freeze, "VERSION".freeze, "betterlog.gemspec".freeze, "betterlog/config.go".freeze, "betterlog/healthz.go".freeze, "betterlog/redis_cert_cache.go".freeze, "bin/betterlog".freeze, "bin/betterlog_pusher".freeze, "bin/betterlog_sink".freeze, "cloudbuild.yaml".freeze, "cmd/betterlog-server/LICENSE".freeze, "cmd/betterlog-server/main.go".freeze, "config/log.yml".freeze, "go.mod".freeze, "go.sum".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/logger.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/logger_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.2.22".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_spec.rb".freeze, "spec/betterlog/logger_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/severity_spec.rb".freeze, "spec/betterlog/log_event_formatter_spec.rb".freeze, "spec/betterlog/log_spec.rb".freeze, "spec/betterlog/logger_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

data/lib/betterlog/log_event_formatter.rb

@@ -1,3 +1,5 @@
+require 'term/ansicolor'
+
 module Betterlog
   class LogEventFormatter < ActiveSupport::Logger::Formatter
     include ActiveSupport::TaggedLogging::Formatter
@@ -8,13 +10,16 @@ module Betterlog
     end
 
     def call(severity, timestamp, program, message)
-      super
-      message = message.to_s
+      message = super.to_s
       if cc.log.legacy_supported
         if message.blank?
-          return ''
+          message = ''
         elsif !Log::Event.is?(message)
-          m = message.sub(/\s+$/, '')
+
+          m = message.to_s
+          m = Term::ANSIColor.uncolor(m)
+          m = m.sub(/\s+$/, '')
+
           timestamp = timestamp.utc.iso8601(3)
           event = Log::Event.new(
             emitter:    emitter,
@@ -26,7 +31,7 @@ module Betterlog
           if backtrace = m.grep(/^\s*([^:]+):(\d+)/)
             if backtrace.size > 1
               event[:backtrace] = backtrace.map(&:chomp)
-              event[:message] = 'a logged backtrace'
+              event[:message] = backtrace.first
             end
           end
           if l = caller_locations.reverse_each.each_cons(2).find { |c, n|
@@ -42,7 +47,7 @@ module Betterlog
     rescue => e
       Betterlog::Log.logger.error(e)
     ensure
-      # Do not "message << ?\n" - A frozn string may be passed in
+      # Do not "message << ?\n" - A frozen string may be passed in
       message.end_with?(?\n) or message = "#{message}\n"
       return message
     end

data/lib/betterlog/version.rb

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

data/lib/betterlog.rb

@@ -1,6 +1,7 @@
 require 'tins/xt'
 require 'json'
 require 'complex_config'
+require 'term/ansicolor'
 
 module Betterlog
 end

data/spec/betterlog/log_event_formatter_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+module ActiveSupport
+  class Logger
+    class Formatter
+      def call(severity, timestamp, program, message)
+        message
+      end
+    end
+  end
+  module TaggedLogging
+    module Formatter
+    end
+  end
+end
+require 'betterlog/log_event_formatter'
+
+describe Betterlog::LogEventFormatter do
+  let :red do
+    Term::ANSIColor.red { "red" }
+  end
+
+  it 'strips blank messages' do
+    message = described_class.new.(:info, Time.now, 'foo', '    ')
+    expect(message).to eq ?\n
+  end
+
+  it 'uncolors colored message strings' do
+    json = described_class.new.(:info, Time.now, 'foo', red)
+    data = JSON.parse(json)
+    expect(data['message']).to eq 'red'
+  end
+
+  it 'deconstructs backtraces' do
+    msg = <<~end
+    foo.rb:6:in `bar': hi (RuntimeError)
+        from foo.rb:2:in `foo'
+        from foo.rb:9:in `<main>'
+    end
+    json = described_class.new.(:info, Time.now, 'foo', msg)
+    data = JSON.parse(json)
+    expect(data['message']).to eq "foo.rb:6:in `bar': hi (RuntimeError)\n"
+    expect(data['backtrace']).to eq [
+      "foo.rb:6:in `bar': hi (RuntimeError)",
+      "    from foo.rb:2:in `foo'",
+      "    from foo.rb:9:in `<main>'"
+    ]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betterlog
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - betterplace Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -257,6 +257,7 @@ files:
 - spec/betterlog/global_metadata_spec.rb
 - spec/betterlog/log/event_spec.rb
 - spec/betterlog/log/severity_spec.rb
+- spec/betterlog/log_event_formatter_spec.rb
 - spec/betterlog/log_spec.rb
 - spec/betterlog/logger_spec.rb
 - spec/spec_helper.rb
@@ -290,6 +291,7 @@ test_files:
 - spec/betterlog/global_metadata_spec.rb
 - spec/betterlog/log/event_spec.rb
 - spec/betterlog/log/severity_spec.rb
+- spec/betterlog/log_event_formatter_spec.rb
 - spec/betterlog/log_spec.rb
 - spec/betterlog/logger_spec.rb
 - spec/spec_helper.rb