betterlog 0.11.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93ac0b92fff87f8005af14b59044b35a17981c2fd30ca1a3614d52967cf711b8
-  data.tar.gz: 22756efdebaa24185c28ffa2ba76cec177e83177f94b874d4bac13c3d8d87ac5
+  metadata.gz: 29fe6dd6fca5b0294e9f55388615d6d8b58885a2f1898682525d19f239bd4552
+  data.tar.gz: f5495f46f7a6473edbe7a1e4973f9ac021213eb121dd149f5b50d23d191ab9dc
 SHA512:
-  metadata.gz: f4f4313920141cf7b4549da03362eb1ac585a8ac6f8d6bd80bc95cbff178797f507267ae9c9b56ab2423271c0a69dc5e9c3f0cb4c8454c7ff6824530ede26c8d
-  data.tar.gz: 2626a52f7915d4a2699cfcbde0425a736e5c41d1fefb03e13adefaa44961f1f118ac44921f37f34fe9adb7a65b3ee03b145d3cb331e9ca7ac4e6909ca1a45097
+  metadata.gz: 1345db77124853df14e65a3bfb5680b7936de5711cc0f21449d172822e8f44981a500b03cc29a072781039e4692cfc544e63387d817fa1eb65c4ea55995d83c3
+  data.tar.gz: f63ed3284d529d6df4f76f3e885d1c52d6d7dbba024ee08c61fcce8e79e0b8f3e04c1a4d15c7c7de7f017568a3ffea0c0cdd9c4da7f649b38172317abf735a09

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.11.0
+0.13.1

data/betterlog.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: betterlog 0.11.0 ruby lib
+# stub: betterlog 0.13.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "betterlog".freeze
-  s.version = "0.11.0"
+  s.version = "0.13.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-07-20"
   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/log.rb

@@ -90,13 +90,15 @@ module Betterlog
     #
     # @param name the name of the recorded metric.
     # @param value of the recorded metric, defaults to duration if block was given.
+    # @param success a Proc with parameter +result+ that returns true iff block
+    #        result was asuccessful
     # @param **rest additional rest is logged as well.
     # @return [ Log ] this object itself.
-    def metric(name:, value: nil, **rest, &block)
-      time_block(&block)
+    def metric(name:, value: nil, success: -> result { true }, **rest, &block)
+      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
@@ -107,6 +109,7 @@ module Betterlog
         event = build_metric(
           name:     name,
           value:    value || timed_duration,
+          success: success.(result),
           **rest
         )
         emit event
@@ -122,6 +125,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
@@ -155,21 +173,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

@@ -52,7 +52,8 @@ module Betterlog
             invisible = $1.full?
             directive = $2
             key       = $3
-            if value = @event[key]
+            value     = @event[key]
+            unless value.nil?
               formatted_value =
                 if directive
                   case directive

data/lib/betterlog/logger.rb

@@ -83,7 +83,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}"

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.11.0'
+  VERSION         = '0.13.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
 

data/spec/betterlog/log_spec.rb

@@ -147,6 +147,7 @@ describe Betterlog::Log do
         message:  'a metric controller.action=0.123',
         name:     'controller.action',
         value:    0.123,
+        success:  true,
         type:     'metric',
         severity: 'info'
       )
@@ -159,6 +160,7 @@ describe Betterlog::Log do
         message:  'a metric controller.action=0.123',
         name:     'controller.action',
         value:    0.123,
+        success:  true,
         type:     'metric',
         severity: :info,
       )
@@ -172,6 +174,7 @@ describe Betterlog::Log do
         foo:      'bar',
         name:     'controller.action',
         value:    0.123,
+        success:  true,
         type:     'metric',
         severity: 'info'
       )
@@ -184,14 +187,16 @@ describe Betterlog::Log do
         message:   'a metric foo=10.0',
         name:      'foo',
         value:     10.0,
+        success:   true,
         duration:  10.0,
         timestamp: "2011-11-11T10:11:21.000Z",
         type:      'metric',
         severity:  'info'
       )
       expect(instance).to receive(:emit).with(expected_event)
-      Log.metric(name: 'foo') do
+      Log.metric(name: 'foo', success: -> result { result == :success }) do
         Time.dummy = Time.now + 10
+        :success
       end
     end
 
@@ -205,6 +210,7 @@ describe Betterlog::Log do
       expected_event = Log::Event.new(
         name:       'foo',
         value:       3.0,
+        success:     false,
         duration:    3.0,
         timestamp:   "2011-11-11T10:11:14.000Z",
         message:     '"MyEx: we were fucked" while measuring metric foo',
@@ -216,10 +222,11 @@ describe Betterlog::Log do
       expect(instance).to receive(:emit).with(expected_event)
       raised = false
       begin
-        Log.metric(name: 'foo') do
+        Log.metric(name: 'foo', success: -> result { result == :success }) do
           Time.dummy = Time.now + 3
           raise MyEx, "we were fucked"
           Time.dummy = Time.now + 7
+          :success
         end
       rescue MyEx
         raised = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betterlog
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.13.1
 platform: ruby
 authors:
 - betterplace Developers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-07-20 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: