betterlog 0.12.1 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7115268bb45a03504abaca3a279b92ac7db2adb1ecbc998c3542425783d84f05
-  data.tar.gz: 59d9cde12cba986fbaf41a342963d08481f21c7acdbacb4dde266eee4ebfc31b
+  metadata.gz: ab0bc01e77def4b7820e71cda07c6b5bf818bc4b5d57cb7919ef95a7f1171eab
+  data.tar.gz: 1cf84a1362cbcb9a50f58c9e6564116583551b6ac8255488610232ead648b3dc
 SHA512:
-  metadata.gz: 6aa326b118ace17506694f1448ddb029e4833184b9cd0d015f610b91eb394a85807edc80e7aeb74e993f034f78eecb7b62c90c045357e1e7fb7225994dffe514
-  data.tar.gz: 22299acccb72b4db01c69e07dcfed18744753011e1af817615bda3e008cade03af214761c0ed8cf640297b907eefbba98601fde770c2e4a0e80ab926cb246748
+  metadata.gz: 4806e3547a67f868391d145bac2674439b88e465f00f7d12724a765aa9d55935d18ab2b7e16020cd3517d5bae899202235c8d54ab2c8de1208d405864de79c57
+  data.tar.gz: 6cba1b114dfa657be363435b00a0d807aa7292852aa173a28727c950dd84d2206f9496673e575c688bd0b1b8a2a53ef8ad8814eaa4760e9e8885c85efe1621a6

data/Dockerfile

@@ -1,6 +1,4 @@
-ARG BASE_IMAGE
-
-FROM ${BASE_IMAGE} AS builder
+FROM alpine:3.12.0 AS builder
 
 # Update/Upgrade/Add packages for building
 
@@ -20,7 +18,7 @@ RUN go get -u github.com/betterplace/go-init
 
 RUN make fetch all
 
-FROM ${BASE_IMAGE} AS runner
+FROM alpine:3.12.0 AS runner
 
 # Update/Upgrade/Add packages
 

data/Makefile

@@ -1,4 +1,3 @@
-# Pass BASE_IMAGE=alpine:3.13.3
 DOCKER_IMAGE_LATEST = betterlog
 DOCKER_IMAGE = $(DOCKER_IMAGE_LATEST):$(REVISION_SHORT)
 PROJECT_ID = betterplace-183212
@@ -48,15 +47,12 @@ tags: clean
 build-info:
 	@echo $(DOCKER_IMAGE)
 
-pull-base:
-	docker pull $(BASE_IMAGE)
-
-build: pull-base
-	docker build -t $(DOCKER_IMAGE) --build-arg=BASE_IMAGE=$(BASE_IMAGE) .
+build:
+	docker build -t $(DOCKER_IMAGE) .
 	$(MAKE) build-info
 
-build-force: pull-base
-	docker build -t $(DOCKER_IMAGE) --build-arg=BASE_IMAGE=$(BASE_IMAGE) --no-cache .
+build-force:
+	docker build -t $(DOCKER_IMAGE) --no-cache .
 	$(MAKE) build-info
 
 debug:

data/VERSION

@@ -1 +1 @@
-0.12.1
+0.14.1

data/betterlog.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: betterlog 0.12.1 ruby lib
+# stub: betterlog 0.14.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "betterlog".freeze
-  s.version = "0.12.1"
+  s.version = "0.14.1"
 
   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-04-02"
+  s.date = "2020-08-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]

data/bin/betterlog_sink

@@ -7,14 +7,14 @@ require 'json'
 
 LOG_ENV = ENV.fetch('LOG_ENV', 'production')
 
+@config = complex_config.log(LOG_ENV).sink
+
 ENV['KUBECONFIG'] = File.join(
   ENV.fetch('HOME'),
   '.kube',
-  "betterlog-#{LOG_ENV}"
+  @config.cluster.name
 )
 
-@config = complex_config.log(LOG_ENV).sink
-
 def authenticate
   return if File.exist?(ENV['KUBECONFIG'])
   context =  [

data/cloudbuild.yaml

@@ -1,8 +1,6 @@
 steps:
 - name: eu.gcr.io/betterplace-183212/better-builder
-  args: ['pull', '${_BASE_IMAGE}']
-- name: eu.gcr.io/betterplace-183212/better-builder
-  args: ['build', '-t', 'eu.gcr.io/$PROJECT_ID/${_IMAGE_NAME}:$SHORT_SHA', '-t', 'eu.gcr.io/$PROJECT_ID/${_IMAGE_NAME}', '--build-arg=BASE_IMAGE=${_BASE_IMAGE}', '.']
+  args: ['build', '-t', 'eu.gcr.io/$PROJECT_ID/${_IMAGE_NAME}:$SHORT_SHA', '-t', 'eu.gcr.io/$PROJECT_ID/${_IMAGE_NAME}', '.']
 images:
   - 'eu.gcr.io/$PROJECT_ID/${_IMAGE_NAME}:$SHORT_SHA'
   - 'eu.gcr.io/$PROJECT_ID/${_IMAGE_NAME}'

data/lib/betterlog.rb

@@ -2,6 +2,7 @@ require 'tins/xt'
 require 'json'
 require 'logger'
 require 'time'
+require 'complex_config'
 require 'term/ansicolor'
 
 module Betterlog

data/lib/betterlog/log.rb

@@ -7,12 +7,16 @@ require 'betterlog/log/severity'
 module Betterlog
   class Log
     include Tins::SexySingleton
+    extend ComplexConfig::Provider::Shortcuts
 
     class_attr_accessor :default_logger
     self.default_logger = Logger.new(STDERR)
+    if level = cc.log?&.level?
+      default_logger.level = level
+    end
 
     def logger
-      defined?(Rails) && Rails.respond_to?(:logger) ? Rails.logger : ::Logger.new(STDERR)
+      defined?(Rails) && Rails.respond_to?(:logger) ? Rails.logger : self.class.default_logger
     end
 
     # Logs a message on severity info.
@@ -98,7 +102,7 @@ module Betterlog
       result = time_block(&block)
     rescue => error
       e = Log::Event.ify(error)
-      rest |= e.as_hash.subhash(:error_class, :backtrace, :message)
+      rest |= e.as_json.subhash(:error_class, :backtrace, :message)
       rest[:message] = "#{rest[:message].inspect} while measuring metric #{name}"
       raise error
     ensure
@@ -125,6 +129,21 @@ module Betterlog
       instance.context(data_hash)
     end
 
+    def emit(event)
+      l = caller_locations.reverse_each.each_cons(3).find { |c, n1, n2|
+        n2.absolute_path =~ /betterlog\/log\.rb/ and break c # TODO check if this still works
+      }
+      if l
+        event[:location] = [ l.absolute_path, l.lineno ] * ?:
+      end
+      event[:emitter] = self.class.name.downcase
+      notify(event)
+      logger.send(event.severity.to_sym, event.to_json)
+      self
+    ensure
+      GlobalMetadata.data.clear
+    end
+
     private
 
     def protect
@@ -158,21 +177,6 @@ module Betterlog
       )
     end
 
-    def emit(event)
-      l = caller_locations.reverse_each.each_cons(3).find { |c, n1, n2|
-        n2.absolute_path =~ /betterlog\/log\.rb/ and break c # TODO check if this still works
-      }
-      if l
-        event[:location] = [ l.absolute_path, l.lineno ] * ?:
-      end
-      event[:emitter] = self.class.name.downcase
-      notify(event)
-      logger.send(event.severity.to_sym, event.to_json)
-      self
-    ensure
-      GlobalMetadata.data.clear
-    end
-
     def notify(event)
       if event.notify?
         Notifiers.notify(event)

data/lib/betterlog/log/event.rb

@@ -70,12 +70,12 @@ module Betterlog
         @data = Hash[data.sort_by(&:first)]
       end
 
-      def as_hash(*a)
+      def as_json(*a)
         @data.dup
       end
 
       def to_json(*a)
-        as_hash.to_json(*a)
+        as_json.to_json(*a)
       end
 
       def format(*args)

data/lib/betterlog/log/event_formatter.rb

@@ -2,6 +2,7 @@ module Betterlog
   class Log
     class EventFormatter
       include Term::ANSIColor
+      include ComplexConfig::Provider::Shortcuts
 
       def initialize(event)
         @event = event

data/lib/betterlog/log_event_formatter.rb

@@ -1,6 +1,7 @@
 module Betterlog
   class LogEventFormatter < ActiveSupport::Logger::Formatter
     include ActiveSupport::TaggedLogging::Formatter
+    include ComplexConfig::Provider::Shortcuts
 
     def emitter
       'legacy'

data/lib/betterlog/logger.rb

@@ -2,9 +2,15 @@ require 'redis'
 
 module Betterlog
   class Logger < ::Logger
+    include ComplexConfig::Provider::Shortcuts
+
     def initialize(redis, shift_age = 0, shift_size = 1048576, name: nil, buffer_size: nil, **opts)
       @redis       = redis
       @fallback    = ::Logger.new(STDERR)
+      if level = cc.log.level?
+        self.level      = level
+        @fallback.level = level
+      end
       @name        = name || self.class.name
       @buffer_size = determine_buffer_size(buffer_size)
       super(nil, shift_age, shift_size, **opts)
@@ -83,7 +89,7 @@ module Betterlog
       rescue Redis::BaseConnectionError
       end
 
-      @redis.exists(@name) or return Enumerator.new {}
+      @redis.exists?(@name) or return Enumerator.new {}
 
       Enumerator.new do |y|
         name_tmp = "#{@name}_#{rand}"
@@ -92,7 +98,9 @@ module Betterlog
         s = 0
         e = @redis.strlen(name_tmp) - 1
         until s > e
-          y.yield @redis.getrange(name_tmp, s, s + chunk_size - 1)
+          range = @redis.getrange(name_tmp, s, s + chunk_size - 1)
+          range.force_encoding 'ASCII-8BIT'
+          y.yield range
           s += chunk_size
         end
 
@@ -115,9 +123,10 @@ module Betterlog
       chunk_size > 0 or raise ArgumentError, 'chunk_size > 0 required'
       Enumerator.new do |y|
         buffer = ''
+        buffer.encode! 'ASCII-8BIT'
         each_chunk(chunk_size: chunk_size) do |chunk|
           buffer << chunk
-          buffer.gsub!(/\A(.*?#$/)/) do |line|
+          buffer.gsub!(/\A(.*?#$/)/n) do |line|
             y.yield(line)
             ''
           end

data/lib/betterlog/notifiers.rb

@@ -14,7 +14,7 @@ module Betterlog
 
     def self.notify(event)
       notifiers.each do |notifier|
-        notifier.notify(event.notify?, event.as_hash)
+        notifier.notify(event.notify?, event.as_json)
       end
     end
 

data/lib/betterlog/version.rb

@@ -1,6 +1,6 @@
 module Betterlog
   # Betterlog version
-  VERSION         = '0.12.1'
+  VERSION         = '0.14.1'
   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_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe Betterlog::Log::Event do
-  describe '#as_hash' do
+  describe '#as_json' do
     it 'dups hash before returning it' do
       event = described_class.new
-      expect(event.as_hash).not_to equal event.instance_variable_get(:@data)
+      expect(event.as_json).not_to equal event.instance_variable_get(:@data)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betterlog
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.14.1
 platform: ruby
 authors:
 - betterplace Developers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -248,7 +248,7 @@ files:
 homepage: http://github.com/betterplace/betterlog
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - Betterlog
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Structured logging support for bp
 test_files: