klogger-logger 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 721caa676f9ec6ff59d0faa7823f40b63c9ca1fbcde1ac017e19c0f809000574
-  data.tar.gz: '0686ea87fa8f6f86a79b599ed11009061608adcf2884069381fad7f4b6a69d4e'
+  metadata.gz: 1ac760c41d8504df687dc68832aeae5aee47757205521a40807dec10ee9e9833
+  data.tar.gz: 9f2a9ea6b0a464b81c82b5413d6ff733ad82f3aaa875cd7223e6b92da0523ea4
 SHA512:
-  metadata.gz: 594e56869cb217f308d49e1d5ab5a6669b6c69cb617e64f853a357fd8a30b8d2fc88803157cf54bb7ee9e12641ab2264fab364d7e57f5814c712bbdeb8238805
-  data.tar.gz: 737f6c90d84067dbb1f6697f5f3c6466c83ebc5d1dd3054481b4397bf40737705b4a345d9901fb923768e28374615c0c428f113beb113d3d56785edcedd4de5c
+  metadata.gz: 9819d09b8cc7e2b9bf069af493dd82e1397b4f25a767879d277159a4ab4dbc90a638080cd5519fb0632a1eeddd68688a4cd1dabb9fedeabc9ff0676909e52488
+  data.tar.gz: 4f01f2e1612548ebaa408ccbb25b4fa3b479d0834a384f1a3812b7b3bfbef2600ee31b9b14faaf4bc9b3385256779ed415d7ffbcabf80cc15b481d0a7cd756dd

data/lib/klogger/logger.rb

@@ -4,13 +4,14 @@ require 'logger'
 require 'klogger/formatters/json'
 require 'klogger/formatters/simple'
 require 'klogger/formatters/go'
+require 'concurrent/atomic/thread_local_var'
 
 module Klogger
   class Logger < ::Logger
 
     attr_reader :name
     attr_reader :destinations
-    attr_reader :extra
+    attr_reader :tags
 
     LEVELS = [:debug, :info, :warn, :error, :fatal].freeze
     FORMATTERS = {
@@ -19,33 +20,34 @@ module Klogger
       go: Formatters::Go
     }.freeze
 
-    def initialize(name, destination: $stdout, formatter: :json, highlight: false, extra: {})
+    def initialize(name, destination: $stdout, formatter: :json, highlight: false, tags: {})
       @name = name
-      @extra = extra
+      @tags = tags
       @destinations = []
+      @groups = Concurrent::ThreadLocalVar.new([])
 
       super(destination)
       self.formatter = FORMATTERS[formatter].new(highlight: highlight)
     end
 
-    def exception(exception, message = nil, **additional)
+    def exception(exception, message = nil, **tags)
       error({ message: message,
               exception: exception.class.name,
               exception_message: exception.message,
-              backtrace: exception.backtrace[0, 4].join("\n") }.merge(additional))
+              backtrace: exception.backtrace[0, 4].join("\n") }.merge(tags))
     end
 
     LEVELS.each do |level|
-      define_method(level) do |message = nil, progname = nil, **additional, &block|
-        add(Logger.const_get(level.to_s.upcase), message, progname, **additional, &block)
+      define_method(level) do |message = nil, progname = nil, **tags, &block|
+        add(Logger.const_get(level.to_s.upcase), message, progname, **tags, &block)
       end
     end
 
-    def group(**additional)
-      groups << additional
+    def group(**tags)
+      @groups.value += [tags]
       yield
     ensure
-      groups.pop
+      @groups.value.pop
     end
 
     def silence!
@@ -76,33 +78,27 @@ module Klogger
 
     private
 
-    def groups
-      @groups ||= []
-    end
-
-    def add(severity, message = nil, progname = nil, **extra, &block)
+    def add(severity, message = nil, progname = nil, **tags, &block)
       return if silenced?
 
       severity ||= Logger::UNKNOWN
       return if severity < level
 
-      payload = create_payload(severity, message, extra)
-
-      @destinations.each do |destination|
-        destination.call(self, payload.dup)
-      rescue StandardError => e
-        # If something goes wrong in here, we don't want to break the application
-        # so we will rescue that and we'll just use standard warn.
-        Kernel.warn "Error while sending payload to destination (#{e.class}): #{e.message}"
+      if message && block_given?
+        message = "#{message}: #{block.call}"
+      elsif block_given?
+        message = block.call
       end
 
+      payload = create_payload(severity, message, tags)
+      call_destinations(payload)
       super(severity, payload, progname, &block)
     end
 
     # rubocop:disable Metrics/AbcSize
-    def create_payload(severity, message, extra)
+    def create_payload(severity, message, tags)
       payload = { time: Time.now.to_s, severity: LEVELS[severity]&.to_s, logger: @name }
-      payload.merge!(@extra)
+      payload.merge!(@tags)
 
       if message.is_a?(Hash)
         payload.merge!(message)
@@ -110,14 +106,24 @@ module Klogger
         payload[:message] = message
       end
 
-      payload.merge!(extra)
+      payload.merge!(tags)
       payload.delete(:message) if payload[:message].nil?
       payload.compact!
 
-      groups.each { |group| payload.merge!(group) }
+      @groups.value.each { |group| payload.merge!(group) }
       payload
     end
     # rubocop:enable Metrics/AbcSize
 
+    def call_destinations(payload)
+      @destinations.each do |destination|
+        destination.call(self, payload.dup)
+      rescue StandardError => e
+        # If something goes wrong in here, we don't want to break the application
+        # so we will rescue that and we'll just use standard warn.
+        Kernel.warn "Error while sending payload to destination (#{e.class}): #{e.message}"
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klogger-logger
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Adam Cooke
@@ -10,6 +10,26 @@ bindir: bin
 cert_chain: []
 date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement