klogger-logger 1.1.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb61b7c35a079dfda06d125ae652fd71d78b994f710aafaf687eb177ec822b8d
-  data.tar.gz: b837d26cf1f5d59833a01e6b4c547e5ab05c60f1b23e464c894255010679102b
+  metadata.gz: 05fcc83ebb5b6dcc9d947576d52b6d14ddd47c89de9ccfbe361df9dc1f9f33ed
+  data.tar.gz: f3f0d69f3427200dc9bbc74dee90f7dc8ad63aeb1364d8a47ec4c81e463189fb
 SHA512:
-  metadata.gz: d421b706f0460136f38f1219053ce0b2aa55f9bf1c972113c75eaf3caa8a82f1cec798f1558226f6e9bac9fff13d2cb82a44d387d76d3aa45c5a85aa0cdce3cf
-  data.tar.gz: 5a2eae41db68d08a53fb92e7118ffe1617a34588dffaf037867d0885e099956900cf0c96252b9f9739992639ee628dc220c7d7bf6e7e678dee2f63c39867c652
+  metadata.gz: c7e688edcf1a9454b422b9aefa6e687298b133a7f847b5c2f6dd0717a1afae395dd83ff68b639a238256e7f1a70f130ae5de18c779cbe6ac3f7c53f824631558
+  data.tar.gz: 77a325bb4eada003e7bfd46a47ec662db1436a4d85c9e12ce2da6bd7a1d5a8ba6d7bbe8ea5f79d73dbadff1baa6adebc1e968bbdc06da2f11e47bcd0b74e235b

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,46 @@
+# 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_without_id(**tags)
+      add_without_id(**tags)
+      yield
+    ensure
+      pop
+    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 add_without_id(**tags)
+      @groups.value += [{ tags: tags }]
+      nil
+    end
+
+    def pop
+      @groups.value.pop
+    end
+
+  end
+end

data/lib/klogger/logger.rb

@@ -6,6 +6,7 @@ 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
@@ -21,14 +22,14 @@ module Klogger
       go: Formatters::Go
     }.freeze
 
-    def initialize(name, destination: $stdout, formatter: :json, highlight: false, include_group_ids: 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
@@ -46,11 +47,20 @@ module Klogger
       end
     end
 
-    def group(**tags)
-      @groups.value += [{ id: SecureRandom.hex(4), tags: 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 tagged(**tags, &block)
+      @group_set.call_without_id(**tags, &block)
     end
 
     def silence!
@@ -99,7 +109,8 @@ module Klogger
     end
 
     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)
@@ -129,9 +140,12 @@ module Klogger
 
     def add_groups_to_payload(payload)
       group_ids = []
-      @groups.value.each do |group|
-        payload.merge!(group[:tags])
-        group_ids << group[:id]
+
+      [Klogger.global_groups, @group_set].each do |group_set|
+        group_set.groups.each do |group|
+          payload.merge!(group[:tags])
+          group_ids << group[:id] if group[:id]
+        end
       end
 
       payload[:groups] = group_ids.join(',') if @include_group_ids

data/lib/klogger.rb

@@ -8,4 +8,16 @@ 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
+
+  def self.tagged(**tags, &block)
+    global_groups.call_without_id(**tags, &block)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klogger-logger
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Adam Cooke
@@ -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