betterlog 0.12.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19d827dd5737b98f60f8e2a6aa64d3f9651d976b2f30a0547154d48e45a893f8
-  data.tar.gz: 488821623937b7b5143759afa38ca371cbb5541340423b8ca441e57904c26299
+  metadata.gz: 12593a18d28fc916e5c30257103937523a972f44a588087dd929742d99043b37
+  data.tar.gz: d0db15ffbe77f7f088c61c073c72a6847a79b07fd9c7f075fa4b8acdfdedaf50
 SHA512:
-  metadata.gz: 158de8bb4b4de6006b24d99b4f5cc709c91445438e49479fa55d1dcd52e78ae6153c9039022c92aa2832f88e721b068c82094b32ef054772cd5c6a759ec23a79
-  data.tar.gz: 4fface48b8f0a17697b14ed24cfebff578b2621c09a8a15c199aa518cd0d978c2f7423154ccf4c548fbb6ad088b24de79ec35404e1f80a45d980afbf80f53eb9
+  metadata.gz: 7e1b2ff2e6ac4bbe60eefcf48755e143fda9eb122c3392a9cba45e8996df5473903f4bb2a36bb657b1a80acf451215bf377782a33ba447ac61bad5ee7723644f
+  data.tar.gz: fca5f361f59320ed444e87f49a620a19b6e9a8d446b1e5c2e8255249915ffbe705787a660cf687c265105c60e24e9768ac427f360b18dafb4b282bf827aa7407

data/.semaphore/semaphore.yml

@@ -0,0 +1,60 @@
+version: v1.0
+name: Betterlog pipeline
+agent:
+  machine:
+    type: e1-standard-2
+    os_image: ubuntu1804
+
+blocks:
+  - name: Caching
+    task:
+      prologue:
+        commands:
+          - checkout
+      jobs:
+        - name: cache bundle
+          commands:
+            - sem-version ruby 2.7.2
+            - cache restore gems-$SEMAPHORE_GIT_BRANCH,gems-master
+            - bundle config jobs $(getconf _NPROCESSORS_ONLN)
+            - bundle install
+            - cache store gems-$SEMAPHORE_GIT_BRANCH vendor/bundle
+
+  - name: "Unit tests"
+    task:
+      env_vars:
+        - name: RAILS_ENV
+          value: test
+      prologue:
+        commands:
+          - checkout
+
+          # Setup ruby
+          - sem-version ruby 2.7.2
+
+          # Setup gems
+          - cache restore gems-$SEMAPHORE_GIT_BRANCH,gems-master
+          - bundle config jobs $(getconf _NPROCESSORS_ONLN)
+          - bundle install
+
+      jobs:
+        - name: RSpec Unit Tests
+          commands:
+            - rake
+
+  - name: Building Docker Image
+    task:
+
+      secrets:
+        - name: GCP
+
+      prologue:
+        commands:
+          - gcloud auth activate-service-account --key-file=.secrets/gcp.json
+          - gcloud auth configure-docker -q
+          - checkout
+
+      jobs:
+        - name: Building and pushing
+          commands:
+            - make build push-latest

data/Dockerfile

@@ -1,6 +1,4 @@
-ARG BASE_IMAGE
-
-FROM ${BASE_IMAGE} AS builder
+FROM alpine:3.12.1 AS builder
 
 # Update/Upgrade/Add packages for building
 
@@ -18,9 +16,9 @@ RUN make clobber
 
 RUN go get -u github.com/betterplace/go-init
 
-RUN make fetch all
+RUN make setup all
 
-FROM ${BASE_IMAGE} AS runner
+FROM alpine:3.12.1 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
@@ -19,7 +18,7 @@ betterlog-server: cmd/betterlog-server/main.go betterlog/*.go
 local: betterlog-server
 	REDIS_URL=$(REDIS_URL) ./betterlog-server
 
-fetch: fake-package
+setup: fake-package
 	go mod download
 
 fake-package:
@@ -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/Rakefile

@@ -30,6 +30,7 @@ GemHadar do
   development_dependency 'rake'
   development_dependency 'rspec'
   development_dependency 'simplecov'
+  development_dependency 'mock_redis'
 end
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.12.2
+0.15.0

data/betterlog.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
-# stub: betterlog 0.12.2 ruby lib
+# stub: betterlog 0.15.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "betterlog".freeze
-  s.version = "0.12.2"
+  s.version = "0.15.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 = "2020-04-20"
+  s.date = "2020-11-02"
   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, ".travis.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.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.2".freeze
+  s.rubygems_version = "3.1.4".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]
 
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency(%q<rake>.freeze, [">= 0"])
     s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_development_dependency(%q<mock_redis>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.3", ">= 1.22.0"])
     s.add_runtime_dependency(%q<complex_config>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<file-tail>.freeze, ["~> 1.0"])
@@ -42,6 +43,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rake>.freeze, [">= 0"])
     s.add_dependency(%q<rspec>.freeze, [">= 0"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_dependency(%q<mock_redis>.freeze, [">= 0"])
     s.add_dependency(%q<tins>.freeze, ["~> 1.3", ">= 1.22.0"])
     s.add_dependency(%q<complex_config>.freeze, [">= 0"])
     s.add_dependency(%q<file-tail>.freeze, ["~> 1.0"])

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

@@ -1,8 +1,6 @@
 require 'tins/xt'
 require 'json'
-require 'logger'
-require 'time'
-require 'term/ansicolor'
+require 'complex_config'
 
 module Betterlog
 end
@@ -13,7 +11,6 @@ require 'betterlog/global_metadata'
 require 'betterlog/logger'
 
 if defined? Rails
-  require 'betterlog/log_event_formatter'
   require 'betterlog/railtie'
 end
 

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.

data/lib/betterlog/log/event_formatter.rb

@@ -1,7 +1,11 @@
+require 'time'
+require 'term/ansicolor'
+
 module Betterlog
   class Log
     class EventFormatter
       include Term::ANSIColor
+      include ComplexConfig::Provider::Shortcuts
 
       def initialize(event)
         @event = event

data/lib/betterlog/log/severity.rb

@@ -1,3 +1,5 @@
+require 'logger'
+
 module Betterlog
   class Log
     class Severity

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

@@ -1,10 +1,20 @@
-require 'redis'
+begin
+  require 'redis' unless defined?(Redis)
+rescue LoadError
+end
+require 'logger'
 
 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 +93,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 +102,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 +127,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/railtie.rb

@@ -1,6 +1,7 @@
 module Betterlog
   class Railtie < Rails::Railtie
     initializer "betterlog_railtie.configure_rails_initialization" do
+      require 'betterlog/log_event_formatter'
       Rails.logger.formatter = Betterlog::LogEventFormatter.new
     end
   end

data/lib/betterlog/version.rb

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

data/spec/spec_helper.rb

@@ -9,5 +9,11 @@ begin
   require 'byebug'
 rescue LoadError
 end
+require 'mock_redis'
+class MockRedis
+  class BaseConnectionError < StandardError; end
+  class CannotConnectError < BaseConnectionError; end
+end
+Redis=MockRedis
 require 'betterlog'
 Betterlog::Log.default_logger = Logger.new(nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betterlog
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.15.0
 platform: ruby
 authors:
 - betterplace Developers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mock_redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +220,7 @@ extra_rdoc_files:
 - lib/betterlog/version.rb
 files:
 - ".gitignore"
-- ".travis.yml"
+- ".semaphore/semaphore.yml"
 - Dockerfile
 - Gemfile
 - LICENSE
@@ -248,7 +262,7 @@ files:
 homepage: http://github.com/betterplace/betterlog
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - Betterlog
@@ -267,8 +281,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Structured logging support for bp
 test_files:

data/.travis.yml

@@ -1,6 +0,0 @@
-rvm:
-  - 2.6
-  - 2.7
-sudo: false
-services:
-  - redis-server