contextual_logger 1.2.0.colin.4 → 1.2.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b8180f031cfc4c1facc22a0cfbbadf8970b01a1b7c1d18f974dbf54fd1712d5
-  data.tar.gz: d310df13569303aa5f6964d1cf9f73583fcfcabcd5950f330b00a30f8eb151f5
+  metadata.gz: d5ee8cad9d62ca2d8aeec81f2626b56b4aa6b1db2c6b626518a4708d590ddb4c
+  data.tar.gz: 71be08f271be68de04f942abfa301a2a5ec54be54d0399bb01db8bcf52a07037
 SHA512:
-  metadata.gz: e0c0350c9f36cf27071a7e1da1f42363979852304c4b029ca24d0a550c77bfb403815dc09420d5c8d9c164b003f8a22213e5d33216e1647ae63143a3b73447e9
-  data.tar.gz: 4984642ce8b36e78c3f14f0415ac95d67dec97f9f5651f6c63deb715bbfa27134243f7286e09802146b6629df0bc1077c476ea3e3d5ad783779daa718aef032d
+  metadata.gz: 2b455d41a46223ea9c6e2583a7d03d81940743215c4eb1dd5977d6ffc8f8ffcb618ce27a3b975fed211987b592e0cfdbc1e691ceef155641764c5d8938da0679
+  data.tar.gz: 6600b357b1dc7b25ee8e746f17280a7e74ac184b38a03340f48e835659259135321a0c0ff0d7c387a7b06b9804b82ad63f8b76a911790a6fb5c2f99a61c0cfdc

data/lib/contextual_logger/context/handler.rb

@@ -0,0 +1,28 @@
+# 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

data/lib/contextual_logger/logger_with_context.rb

@@ -19,10 +19,6 @@ 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.2.0.colin.4'
+  VERSION = '1.2.0.pre.1'
 end

data/lib/contextual_logger.rb

@@ -4,8 +4,7 @@ require 'active_support'
 require 'active_support/core_ext/module/delegation'
 require 'json'
 require_relative './contextual_logger/redactor'
-require_relative './contextual_logger/context'
-require_relative './contextual_logger/context_handler'
+require_relative './contextual_logger/context/handler'
 
 module ContextualLogger
   LOG_LEVEL_NAMES_TO_SEVERITY =
@@ -44,40 +43,31 @@ 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)
-      @global_context = context.freeze
-    end
-
-    def current_context
-      current_context_override || global_context
+      Context::Handler.new(context).set!
     end
 
-    # TODO: Deprecate current_context_for_thread in v2.0.
-    alias current_context_for_thread current_context
-
     def with_context(context)
-      previous_context_override = current_context_override
-      self.current_context_override = current_context.deep_merge(context)
+      context_handler = Context::Handler.new(current_context_for_thread.deep_merge(context))
+      context_handler.set!
       if block_given?
         begin
           yield
         ensure
-          self.current_context_override = previous_context_override
+          context_handler.reset!
         end
       else
-        # If no block given, return context handler to the caller so they can call reset! themselves.
-        ContextHandler.new(self, previous_context_override)
+        # If no block given, the context handler is returned to the caller so they can handle reset! themselves.
+        context_handler
       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`,
@@ -127,7 +117,7 @@ module ContextualLogger
           message = arg1
           progname = arg2 || @progname
         end
-        write_entry_to_log(severity, Time.now, progname, message, context: current_context.deep_merge(context))
+        write_entry_to_log(severity, Time.now, progname, message, context: current_context_for_thread.deep_merge(context))
       end
 
       true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contextual_logger
 version: !ruby/object:Gem::Version
-  version: 1.2.0.colin.4
+  version: 1.2.0.pre.1
 platform: ruby
 authors:
 - James Ebentier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-02 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -45,8 +45,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/contextual_logger.rb
-- lib/contextual_logger/context.rb
-- lib/contextual_logger/context_handler.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

data/lib/contextual_logger/context.rb

@@ -1,18 +0,0 @@
-# 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_override
-      Thread.current[thread_context_for_logger_instance]
-    end
-
-    def current_context_override=(context_override)
-      Thread.current[thread_context_for_logger_instance] = context_override.freeze
-    end
-  end
-end

data/lib/contextual_logger/context_handler.rb

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