dry-logger 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64477022ad878f3e1a98d7fb8b82bb9117b8d09c662ecf12b89fda0bca0bc8dd
-  data.tar.gz: f69f6a4d5a1daf532f4a569789fa9e087b44889cdb6f47b048e5d3961a93a893
+  metadata.gz: 8d27303efa558c60b1f0f9710b1c9419223d7b421c61b7f6efbea241b54ca486
+  data.tar.gz: ada0ee3f313045a3cfbcd26e15da7642741d6217efe3e834542935b5efbaa0b9
 SHA512:
-  metadata.gz: 4ed4f26c990c6e85575fd06f5064fbd68ca73a11ecb4370e749455cc980edf319905e672d7f2bc798ec0f80df235f0c86cf1b50786eb891b71fb142b2a2c4590
-  data.tar.gz: 527a960b08d0083fbbbc086e5b946d896021ff0d3295916c42eed5f41e5d1131d15633e7d0926cb7dbe528098c0943e965189a5e0c6076845bc567bd04c6d96a
+  metadata.gz: 5c42481abe364e3550091fe8d1d8fcfbd3e2b23fa00943ca22e8a13f9d6c20cf7bf7846390498c5fb098c7cb45ff9cef461f9bddde50f4382a719e288af9731d
+  data.tar.gz: c91f8c1e74e4b1dc7fdeaa62870453e303018e7f5e4b0f25152a805cc20c15c04fea719caef6a6feb756f41291f319dd9ebca3b2275dbedc470e4ff22d5ed3fd

data/CHANGELOG.md

@@ -19,6 +19,20 @@ and this project adheres to [Break Versioning](https://www.taoensso.com/break-ve
 
 ### Security
 
+[Unreleased]: https://github.com/dry-rb/dry-logger/compare/v1.2.1...main
+
+## [1.2.1] - 2025-12-16
+
+### Changed
+
+- Support Ruby 4.0 by adding the `"logger"` gem to the list of runtime dependencies. (@timriley in #39)
+
+### Fixed
+
+- Ensure changes to `logger.context` and calls to `logger.tagged` are threadsafe. (@timriley in #38)
+
+[1.2.1]: https://github.com/dry-rb/dry-logger/compare/v1.2.0...v1.2.1
+
 ## [1.2.0] - 2025-11-05
 
 ### Changed

data/dry-logger.gemspec

@@ -31,6 +31,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 3.2"
 
+  spec.add_runtime_dependency "logger"
+
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/lib/dry/logger/dispatcher.rb

@@ -6,6 +6,7 @@ require "pathname"
 require "dry/logger/constants"
 require "dry/logger/backends/proxy"
 require "dry/logger/entry"
+require "dry/logger/execution_context"
 
 module Dry
   module Logger
@@ -18,18 +19,6 @@ module Dry
       # @api private
       attr_reader :id
 
-      # (EXPERIMENTAL) Shared payload context
-      #
-      # @example
-      #   logger.context[:component] = "test"
-      #
-      #   logger.info "Hello World"
-      #   # Hello World component=test
-      #
-      # @since 1.0.0
-      # @api public
-      attr_reader :context
-
       # @since 1.0.0
       # @api private
       attr_reader :backends
@@ -86,21 +75,13 @@ module Dry
 
       # @since 1.0.0
       # @api private
-      def self.default_context
-        Thread.current[:__dry_logger__] ||= {}
-      end
-
-      # @since 1.0.0
-      # @api private
-      def initialize(
-        id, backends: [], tags: [], context: self.class.default_context, **options
-      )
+      def initialize(id, backends: [], tags: [], context: {}, **options)
         @id = id
         @backends = backends
         @options = {**options, progname: id}
         @mutex = Mutex.new
-        @context = context
-        @tags = tags
+        @default_tags = tags.freeze
+        @default_context = context.freeze
         @clock = Clock.new(**(options[:clock] || EMPTY_HASH))
         @on_crash = options[:on_crash] || ON_CRASH
       end
@@ -226,7 +207,7 @@ module Dry
             clock: clock,
             progname: progname,
             severity: severity,
-            tags: @tags,
+            tags: current_tags,
             message: message,
             payload: {**context, **payload}
           )
@@ -244,7 +225,22 @@ module Dry
         true
       end
 
-      # (EXPERIMENTAL) Tagged logging withing the provided block
+      # Shared payload context
+      #
+      # @example
+      #   logger.context[:component] = "test"
+      #
+      #   logger.info "Hello World"
+      #   # Hello World component=test
+      #
+      # @since 1.0.0
+      # @api public
+      def context
+        @context_key ||= :"context_#{object_id}"
+        ExecutionContext[@context_key] ||= @default_context.dup
+      end
+
+      # Tagged logging withing the provided block
       #
       # @example
       #   logger.tagged("red") do
@@ -258,10 +254,10 @@ module Dry
       # @since 1.0.0
       # @api public
       def tagged(*tags)
-        @tags.concat(tags)
+        tags_stack.push(tags)
         yield
       ensure
-        @tags = []
+        tags_stack.pop
       end
 
       # Add a new backend to an existing dispatcher
@@ -310,6 +306,17 @@ module Dry
         each_backend { |backend| backend.public_send(meth, ...) }
         true
       end
+
+      private
+
+      def tags_stack
+        @tags_key ||= :"tags_#{object_id}"
+        ExecutionContext[@tags_key] ||= @default_tags.dup
+      end
+
+      def current_tags
+        tags_stack.flatten
+      end
     end
   end
 end

data/lib/dry/logger/execution_context.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Dry
+  module Logger
+    # Provides isolated thread-local storage for logger values.
+    #
+    # @api private
+    module ExecutionContext
+      CONTEXT_KEY = :__dry_logger__
+
+      class << self
+        # Returns a value from the current execution context.
+        #
+        # @param key [Symbol] the key to retrieve
+        #
+        # @return [Object, nil] the stored value, or nil if no value has been stored
+        def [](key)
+          context[key]
+        end
+
+        # Sets a value in the current execution context.
+        #
+        # @param key [Symbol] the key to store
+        # @param value [Object] the value to store
+        #
+        # @return [Object] the stored value
+        def []=(key, value)
+          context[key] = value
+        end
+
+        # Clears all values from the current execution context.
+        #
+        # @return [self]
+        def clear
+          current_store[CONTEXT_KEY] = {}
+          self
+        end
+
+        private
+
+        def context
+          current_store[CONTEXT_KEY] ||= {}
+        end
+
+        def current_store
+          Thread.current
+        end
+      end
+    end
+  end
+end

data/lib/dry/logger/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Logger
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dry-logger
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Hanakai team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-05 00:00:00.000000000 Z
+date: 2025-12-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +90,7 @@ files:
 - lib/dry/logger/constants.rb
 - lib/dry/logger/dispatcher.rb
 - lib/dry/logger/entry.rb
+- lib/dry/logger/execution_context.rb
 - lib/dry/logger/filter.rb
 - lib/dry/logger/formatters/colors.rb
 - lib/dry/logger/formatters/json.rb