klogger-logger 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ac760c41d8504df687dc68832aeae5aee47757205521a40807dec10ee9e9833
-  data.tar.gz: 9f2a9ea6b0a464b81c82b5413d6ff733ad82f3aaa875cd7223e6b92da0523ea4
+  metadata.gz: eb61b7c35a079dfda06d125ae652fd71d78b994f710aafaf687eb177ec822b8d
+  data.tar.gz: b837d26cf1f5d59833a01e6b4c547e5ab05c60f1b23e464c894255010679102b
 SHA512:
-  metadata.gz: 9819d09b8cc7e2b9bf069af493dd82e1397b4f25a767879d277159a4ab4dbc90a638080cd5519fb0632a1eeddd68688a4cd1dabb9fedeabc9ff0676909e52488
-  data.tar.gz: 4f01f2e1612548ebaa408ccbb25b4fa3b479d0834a384f1a3812b7b3bfbef2600ee31b9b14faaf4bc9b3385256779ed415d7ffbcabf80cc15b481d0a7cd756dd
+  metadata.gz: d421b706f0460136f38f1219053ce0b2aa55f9bf1c972113c75eaf3caa8a82f1cec798f1558226f6e9bac9fff13d2cb82a44d387d76d3aa45c5a85aa0cdce3cf
+  data.tar.gz: 5a2eae41db68d08a53fb92e7118ffe1617a34588dffaf037867d0885e099956900cf0c96252b9f9739992639ee628dc220c7d7bf6e7e678dee2f63c39867c652

data/lib/klogger/logger.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'logger'
+require 'securerandom'
 require 'klogger/formatters/json'
 require 'klogger/formatters/simple'
 require 'klogger/formatters/go'
@@ -20,11 +21,13 @@ module Klogger
       go: Formatters::Go
     }.freeze
 
-    def initialize(name, destination: $stdout, formatter: :json, highlight: false, tags: {})
+    def initialize(name, destination: $stdout, formatter: :json, highlight: false, include_group_ids: false, tags: {})
       @name = name
       @tags = tags
       @destinations = []
-      @groups = Concurrent::ThreadLocalVar.new([])
+      @groups = Concurrent::ThreadLocalVar.new { [] }
+      @silenced = Concurrent::ThreadLocalVar.new { false }
+      @include_group_ids = include_group_ids
 
       super(destination)
       self.formatter = FORMATTERS[formatter].new(highlight: highlight)
@@ -44,28 +47,28 @@ module Klogger
     end
 
     def group(**tags)
-      @groups.value += [tags]
+      @groups.value += [{ id: SecureRandom.hex(4), tags: tags }]
       yield
     ensure
       @groups.value.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,12 +93,11 @@ 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.merge!(@tags)
@@ -110,14 +112,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 +127,16 @@ module Klogger
       end
     end
 
+    def add_groups_to_payload(payload)
+      group_ids = []
+      @groups.value.each do |group|
+        payload.merge!(group[:tags])
+        group_ids << group[:id]
+      end
+
+      payload[:groups] = group_ids.join(',') if @include_group_ids
+      group_ids
+    end
+
   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.1.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