contextual_logger 1.1.1 → 1.2.0.colin.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7d4ef0ffd9faf3c8994edbc8f96cf0fbac7d29d3c776c54228740cc0801ca39
-  data.tar.gz: a423b940026c1830747c60c9c8bdd0eda732a148892ba40309ffd7888cebdd83
+  metadata.gz: fa81557c8d0035dc91b9285be3a429b5c3bef9d27842f62306a827b3a842d284
+  data.tar.gz: f63ece3db1c77acda0f05ea7af4dc581aefff65bb62464977a8b9a645090fe9f
 SHA512:
-  metadata.gz: 62cb70627e93a215057100deb1b7f04c409355f423b3e58ecd37d95268c2ce94bfb73633048fb6c6a83fd0dea4b7383d80bfdf27e91c7258eb36329d00d7de41
-  data.tar.gz: 0be4154aaa62e04201d9c10ab12e199f5c59c387349b4ff28b73d86cc42ee82562a661ba1f11c8c42a8fc378410ce7171be84531093e90feaf4c6993afbbb62e
+  metadata.gz: 5dbfc7e625e0b8e9b7111371da8368194d8d628192f91955cc98807fb0e8ecc67e10473137c1333513376d233c112a990c8fe8e5506741322995433c4f75f62f
+  data.tar.gz: 966f798d247c5cadaa32e2269830153f7280e0ad015554db4f065c7a5f5729f5f39b3f443dde6f8f4659797da218ede4af320ac278723651099c2e8f2495e877

data/lib/contextual_logger/context.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module ContextualLogger
+  module Context
+    def thread_context_for_logger_instance
+      # We include the object_id here to make these thread/fiber locals unique per logger instance.
+      @thread_context_for_logger_instance ||= "ContextualLogger::Context.context_for_#{object_id}".to_sym
+    end
+
+    def current_context
+      Thread.current[thread_context_for_logger_instance]
+    end
+
+    def current_context=(context)
+      Thread.current[thread_context_for_logger_instance] = context.freeze
+    end
+  end
+end

data/lib/contextual_logger/context_handler.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module ContextualLogger
+  class ContextHandler
+    def initialize(instance, previous_context)
+      @instance = instance
+      @previous_context = previous_context
+    end
+
+    def reset!
+      @instance.current_context = @previous_context
+    end
+  end
+end

data/lib/contextual_logger/logger_with_context.rb

@@ -19,6 +19,10 @@ module ContextualLogger
       @merged_context_cache = {}  # so we don't have to merge every time
     end
 
+    def global_context
+      @logger.global_context
+    end
+
     def level
       @override_level || @logger.level
     end

data/lib/contextual_logger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ContextualLogger
-  VERSION = '1.1.1'
+  VERSION = '1.2.0.colin.2'
 end

data/lib/contextual_logger.rb

@@ -4,7 +4,8 @@ require 'active_support'
 require 'active_support/core_ext/module/delegation'
 require 'json'
 require_relative './contextual_logger/redactor'
-require_relative './contextual_logger/context/handler'
+require_relative './contextual_logger/context'
+require_relative './contextual_logger/context_handler'
 
 module ContextualLogger
   LOG_LEVEL_NAMES_TO_SEVERITY =
@@ -43,31 +44,37 @@ module ContextualLogger
   end
 
   module LoggerMixin
+    include Context
+
     delegate :register_secret, :register_secret_regex, to: :redactor
 
+    def global_context
+      @global_context ||= {}.freeze
+    end
+
     def global_context=(context)
-      Context::Handler.new(context).set!
+      @global_context = context.freeze
+    end
+
+    def current_context_for_thread
+      current_context || global_context
     end
 
     def with_context(context)
-      context_handler = Context::Handler.new(current_context_for_thread.deep_merge(context))
-      context_handler.set!
+      previous_context = current_context_for_thread
+      self.current_context = previous_context.deep_merge(context)
       if block_given?
         begin
           yield
         ensure
-          context_handler.reset!
+          self.current_context = previous_context
         end
       else
-        # If no block given, the context handler is returned to the caller so they can handle reset! themselves.
-        context_handler
+        # If no block given, return context handler to the caller so they can call reset! themselves.
+        ContextHandler.new(self, previous_context)
       end
     end
 
-    def current_context_for_thread
-      Context::Handler.current_context
-    end
-
     # In the methods generated below, we assume that presence of context means new code that is
     # aware of ContextualLogger...and that that code never uses progname.
     # This is important because we only get 3 args total (not including &block) passed to `add`,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contextual_logger
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0.colin.2
 platform: ruby
 authors:
 - James Ebentier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-20 00:00:00.000000000 Z
+date: 2023-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -45,7 +45,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/contextual_logger.rb
-- lib/contextual_logger/context/handler.rb
+- lib/contextual_logger/context.rb
+- lib/contextual_logger/context_handler.rb
 - lib/contextual_logger/logger_with_context.rb
 - lib/contextual_logger/overrides/active_support/tagged_logging/formatter.rb
 - lib/contextual_logger/redactor.rb
@@ -67,9 +68,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key:

data/lib/contextual_logger/context/handler.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module ContextualLogger
-  module Context
-    class Handler
-      THREAD_CONTEXT_NAMESPACE = 'ContextualLoggerCurrentLoggingContext'
-
-      attr_reader :previous_context, :context
-
-      def self.current_context
-        Thread.current[THREAD_CONTEXT_NAMESPACE] || {}
-      end
-
-      def initialize(context, previous_context: nil)
-        @previous_context = previous_context || self.class.current_context
-        @context = context
-      end
-
-      def set!
-        Thread.current[THREAD_CONTEXT_NAMESPACE] = context
-      end
-
-      def reset!
-        Thread.current[THREAD_CONTEXT_NAMESPACE] = previous_context
-      end
-    end
-  end
-end