klogger-logger 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ac760c41d8504df687dc68832aeae5aee47757205521a40807dec10ee9e9833
-  data.tar.gz: 9f2a9ea6b0a464b81c82b5413d6ff733ad82f3aaa875cd7223e6b92da0523ea4
+  metadata.gz: d829e62b7472acd3c8c20e0ce8d5e3719c3bf2a5fa6752f23c503b64e56db99f
+  data.tar.gz: d8a76281e8ac428c1c5ffacffcc6edc24c3404742e755a5f831287aa0b1862d6
 SHA512:
-  metadata.gz: 9819d09b8cc7e2b9bf069af493dd82e1397b4f25a767879d277159a4ab4dbc90a638080cd5519fb0632a1eeddd68688a4cd1dabb9fedeabc9ff0676909e52488
-  data.tar.gz: 4f01f2e1612548ebaa408ccbb25b4fa3b479d0834a384f1a3812b7b3bfbef2600ee31b9b14faaf4bc9b3385256779ed415d7ffbcabf80cc15b481d0a7cd756dd
+  metadata.gz: 58b478bddf41b569b4af77b0ef19ca70fccfd4b4f06f31d12c8c411f00f31ef1943f662f264b176e21c9df8087965187e525ddb11f4fad50a4b8e55fa00dcc98
+  data.tar.gz: 73cf53c1c9bd298e5b09518e2ce7f7903d077b9c81648a156a1ea1da61b20f9a287ec3e0cea5a3acde0b97a544f449b1b295466f978741db1b7862e9792a5b6b

data/lib/klogger/formatters/go.rb

@@ -15,7 +15,7 @@ module Klogger
         string = String.new
         string << time.strftime('%Y-%m-%d %H:%M:%S %z')
         string << ' '
-        string << colorize(payload[:severity].ljust(8, ' ').upcase, payload[:severity].to_sym)
+        string << colorize(payload[:severity].ljust(7, ' ').upcase, payload[:severity].to_sym)
         if payload[:message]
           string << colorize(payload[:message], :white)
           string << ' '
@@ -27,7 +27,7 @@ module Klogger
           string << colorize(sanitize_value(value), :white)
           string << ' '
         end
-        string + "\n"
+        string.strip + "\n"
       end
       # rubocop:enable Metrics/AbcSize
       # rubocop:enable Metrics/MethodLength

data/lib/klogger/group_set.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'concurrent/atomic/thread_local_var'
+
+module Klogger
+  class GroupSet
+
+    def initialize
+      @groups = Concurrent::ThreadLocalVar.new { [] }
+    end
+
+    def groups
+      @groups.value
+    end
+
+    def call(**tags)
+      add(**tags)
+      yield
+    ensure
+      pop
+    end
+
+    def add(**tags)
+      id = SecureRandom.hex(4)
+      @groups.value += [{ id: id, tags: tags }]
+      id
+    end
+
+    def pop
+      @groups.value.pop
+    end
+
+  end
+end

data/lib/klogger/logger.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 require 'logger'
+require 'securerandom'
 require 'klogger/formatters/json'
 require 'klogger/formatters/simple'
 require 'klogger/formatters/go'
 require 'concurrent/atomic/thread_local_var'
+require 'klogger/group_set'
 
 module Klogger
   class Logger < ::Logger
@@ -20,12 +22,14 @@ module Klogger
       go: Formatters::Go
     }.freeze
 
-    def initialize(name, destination: $stdout, formatter: :json, highlight: false, tags: {})
+    def initialize(name = nil, destination: $stdout, formatter: :go, highlight: false, include_group_ids: false,
+                   tags: {})
       @name = name
       @tags = tags
       @destinations = []
-      @groups = Concurrent::ThreadLocalVar.new([])
-
+      @group_set = GroupSet.new
+      @silenced = Concurrent::ThreadLocalVar.new { false }
+      @include_group_ids = include_group_ids
       super(destination)
       self.formatter = FORMATTERS[formatter].new(highlight: highlight)
     end
@@ -43,29 +47,34 @@ module Klogger
       end
     end
 
-    def group(**tags)
-      @groups.value += [tags]
-      yield
-    ensure
-      @groups.value.pop
+    def group(**tags, &block)
+      @group_set.call(**tags, &block)
+    end
+
+    def add_group(**tags)
+      @group_set.add(**tags)
+    end
+
+    def pop_group
+      @group_set.pop
     end
 
     def silence!
-      @silence = true
+      @silenced.value = true
       yield if block_given?
     ensure
       unsilence! if block_given?
     end
 
     def unsilence!
-      @silence = false
+      @silenced.value = false
       yield if block_given?
     ensure
       silence! if block_given?
     end
 
     def silenced?
-      @silence == true
+      @silenced.value == true
     end
 
     def add_destination(destination)
@@ -90,14 +99,14 @@ module Klogger
         message = block.call
       end
 
-      payload = create_payload(severity, message, tags)
-      call_destinations(payload)
+      payload, group_ids = create_payload(severity, message, tags)
+      call_destinations(payload, group_ids)
       super(severity, payload, progname, &block)
     end
 
-    # rubocop:disable Metrics/AbcSize
     def create_payload(severity, message, tags)
-      payload = { time: Time.now.to_s, severity: LEVELS[severity]&.to_s, logger: @name }
+      payload = { time: Time.now.to_s, severity: LEVELS[severity]&.to_s }
+      payload[:logger] = @name if @name
       payload.merge!(@tags)
 
       if message.is_a?(Hash)
@@ -110,14 +119,14 @@ module Klogger
       payload.delete(:message) if payload[:message].nil?
       payload.compact!
 
-      @groups.value.each { |group| payload.merge!(group) }
-      payload
+      group_ids = add_groups_to_payload(payload)
+
+      [payload, group_ids]
     end
-    # rubocop:enable Metrics/AbcSize
 
-    def call_destinations(payload)
+    def call_destinations(payload, group_ids)
       @destinations.each do |destination|
-        destination.call(self, payload.dup)
+        destination.call(self, payload.dup, group_ids)
       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.
@@ -125,5 +134,19 @@ module Klogger
       end
     end
 
+    def add_groups_to_payload(payload)
+      group_ids = []
+
+      [Klogger.global_groups, @group_set].each do |group_set|
+        group_set.groups.each do |group|
+          payload.merge!(group[:tags])
+          group_ids << group[:id]
+        end
+      end
+
+      payload[:groups] = group_ids.join(',') if @include_group_ids
+      group_ids
+    end
+
   end
 end

data/lib/klogger.rb

@@ -8,4 +8,12 @@ module Klogger
     Logger.new(*args, **kwargs)
   end
 
+  def self.global_groups
+    @global_groups ||= GroupSet.new
+  end
+
+  def self.group(**tags, &block)
+    global_groups.call(**tags, &block)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klogger-logger
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -78,6 +78,7 @@ files:
 - lib/klogger/formatters/go.rb
 - lib/klogger/formatters/json.rb
 - lib/klogger/formatters/simple.rb
+- lib/klogger/group_set.rb
 - lib/klogger/json_highlighter.rb
 - lib/klogger/logger.rb
 - lib/klogger/version.rb