betterlog 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 310ec632c3d859e3b2ec3bfed5a71df3ce63234799004346df979aa12d6adb7e
-  data.tar.gz: a5f2bf5a77787d58ba3a47ee7a35419bf2d057a5edcc95665e06966ae8d3d422
+  metadata.gz: 27e6af480e7ec65272867c76176a644ce2c925e853aff060074840f17ad5d714
+  data.tar.gz: 0531306c3a7b421691b67e78be5d7e960c91cb421e4e2db22657cdbe2cc248e0
 SHA512:
-  metadata.gz: 4d38842901b4f50db613853f8acb63bd3a3d9f6e06290bd59e5b5f4dc69471848048bc06da20279cf966cf62710105178390838174a0282a4cfcdaa032b6c752
-  data.tar.gz: cc1aa1af891a4e507c43a910e952057546947d27c34e91f96cb9408d99d5e03fd9ff175beb28d206e9e32b0d83e2276c112d9fd450bf0419d6ab5ff26164d51d
+  metadata.gz: '096483149f340b0cb1f8fc5253ad033e7ce7a4dc4abdd2c07c78beb464a8cd95538b956c4f82b45133d2287cfb767c754fdd1fd8079de780534ed9def9532267'
+  data.tar.gz: 610301cb7fc4b028816d78f5ce5f8330b5c04e291ff5099035af49ab3de85def2048455276767b0253f60bebc9d7dd1eb9fb3c3902414ae60e79bf4057ac054b

data/.semaphore/semaphore.yml

@@ -16,6 +16,7 @@ blocks:
           commands:
             - sem-version ruby 2.7.2
             - cache restore gems-$SEMAPHORE_GIT_BRANCH,gems-master
+            - bundle config set path 'vendor/bundle'
             - bundle config jobs $(getconf _NPROCESSORS_ONLN)
             - bundle install
             - cache store gems-$SEMAPHORE_GIT_BRANCH vendor/bundle
@@ -34,13 +35,14 @@ blocks:
 
           # Setup gems
           - cache restore gems-$SEMAPHORE_GIT_BRANCH,gems-master
+          - bundle config set path 'vendor/bundle'
           - bundle config jobs $(getconf _NPROCESSORS_ONLN)
           - bundle install
 
       jobs:
         - name: RSpec Unit Tests
           commands:
-            - rake
+            - bundle exec rake
 
   - name: Building Docker Image
     task:
@@ -51,10 +53,11 @@ blocks:
       prologue:
         commands:
           - gcloud auth activate-service-account --key-file=.secrets/gcp.json
-          - gcloud auth configure-docker -q
+          - gcloud auth configure-docker -q eu.gcr.io
           - checkout
 
       jobs:
         - name: Building and pushing
           commands:
-            - make build push-latest
+            - make build
+            - test "$SEMAPHORE_GIT_BRANCH" = "master" && make push-latest

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.12.1 AS builder
+FROM alpine:3.12.3 AS builder
 
 # Update/Upgrade/Add packages for building
 
@@ -18,7 +18,7 @@ RUN go get -u github.com/betterplace/go-init
 
 RUN make setup all
 
-FROM alpine:3.12.1 AS runner
+FROM alpine:3.12.3 AS runner
 
 # Update/Upgrade/Add packages
 

data/VERSION

@@ -1 +1 @@
-0.15.1
+0.15.2

data/betterlog.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: betterlog 0.15.1 ruby lib
+# stub: betterlog 0.15.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "betterlog".freeze
-  s.version = "0.15.1"
+  s.version = "0.15.2"
 
   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 = "2020-12-07"
+  s.date = "2021-02-03"
   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]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files = [".gitignore".freeze, ".semaphore/semaphore.yml".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.homepage = "http://github.com/betterplace/betterlog".freeze
   s.rdoc_options = ["--title".freeze, "Betterlog".freeze, "--main".freeze, "README.md".freeze]
-  s.rubygems_version = "3.1.4".freeze
+  s.rubygems_version = "3.2.5".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]
 

data/lib/betterlog/log.rb

@@ -138,7 +138,7 @@ module Betterlog
       end
       event[:emitter] = self.class.name.downcase
       notify(event)
-      logger.send(event.severity.to_sym, event.to_json)
+      logger.send(event.severity.to_sym, JSON.generate(event))
       self
     ensure
       GlobalMetadata.data.clear

data/lib/betterlog/log/event.rb

@@ -75,7 +75,15 @@ module Betterlog
       end
 
       def to_json(*a)
-        as_json.to_json(*a)
+        JSON.generate(as_json)
+      rescue
+        # Sometimes rails logging messages contain invalid utf-8 characters
+        # generating various standard errors. Let's fallback to a barebones
+        # event with just a cleaned up message for these cases.
+        JSON.generate({
+          severity: @data[:severity],
+          message: @data.fetch(:message, '').encode('utf-8', invalid: :replace, undef: :replace, replace: ''),
+        })
       end
 
       def format(*args)

data/lib/betterlog/log/event_formatter.rb

@@ -18,7 +18,7 @@ module Betterlog
         when :format
           format_pattern(format: format)
         else
-          @event.to_json
+          JSON.generate(@event)
         end
       ensure
         Term::ANSIColor.coloring = old_coloring

data/lib/betterlog/log_event_formatter.rb

@@ -36,7 +36,7 @@ module Betterlog
             event[:location] = [ l.absolute_path, l.lineno ] * ?:
           end
           program and event[:program] = program
-          message = event.to_json
+          message = JSON.generate(event)
         end
       end
     rescue => e

data/lib/betterlog/version.rb

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

data/spec/betterlog/log_spec.rb

@@ -26,6 +26,17 @@ describe Betterlog::Log do
     end
   end
 
+  describe 'Log::Event.to_json' do
+    it 'can be called' do
+      expect(event.to_json).to be_present
+    end
+
+    it 'can handle invalid UTF-8 characters' do
+      event = Log::Event.ify("foo\xCEbar")
+      expect(event.to_json).to eq(JSON(severity: "DEBUG", message: 'foobar'))
+    end
+  end
+
   describe '.parse' do
     it 'can parse an event as a JSON document' do
       expect(Log::Event.parse(event.to_json)).to eq event

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betterlog
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - betterplace Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.5
 signing_key:
 specification_version: 4
 summary: Structured logging support for bp