dry-logger 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64477022ad878f3e1a98d7fb8b82bb9117b8d09c662ecf12b89fda0bca0bc8dd
-  data.tar.gz: f69f6a4d5a1daf532f4a569789fa9e087b44889cdb6f47b048e5d3961a93a893
+  metadata.gz: d5b1c6d122b7cb90cf0e9d2a847056d8a610813e0c5dd6b4496deb1b172781be
+  data.tar.gz: 4642ad1fb26e02dd1fb660262819d576ab58c64eb376858ebf3f08fe39248d00
 SHA512:
-  metadata.gz: 4ed4f26c990c6e85575fd06f5064fbd68ca73a11ecb4370e749455cc980edf319905e672d7f2bc798ec0f80df235f0c86cf1b50786eb891b71fb142b2a2c4590
-  data.tar.gz: 527a960b08d0083fbbbc086e5b946d896021ff0d3295916c42eed5f41e5d1131d15633e7d0926cb7dbe528098c0943e965189a5e0c6076845bc567bd04c6d96a
+  metadata.gz: 30a77024ebe05dcfc86d6b44e5c3e0262f1a6d27ad8ad4e298e38d763366f8ed3a176014e37b0cc6904dfebee34a18f73a6a13fa61a03d788caf79501a0ddb38
+  data.tar.gz: 498b41ab0fd5cd03bf79b8a04ef7a528ba90294777b0f24e427933f77f75880a5297c1a0252a079156fafe274cb05a0528abafe997c08b318b0a2b6d88cd7b53

data/CHANGELOG.md

@@ -19,6 +19,28 @@ 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.2...main
+
+## [1.2.2] - 2026-03-13
+
+### Fixed
+
+- Exception when message and metadata have different encodings (@katafrakt in #40)
+
+[1.2.2]: https://github.com/dry-rb/dry-logger/compare/v1.2.1...v1.2.2
+
+## [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/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2025 Hanakai team
+Copyright (c) 2015-2026 Hanakai team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -18,4 +18,3 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

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/backends/stream.rb

@@ -21,7 +21,7 @@ module Dry
 
         # @since 0.1.0
         # @api private
-        def initialize( # rubocop:disable Style/ParameterLists
+        def initialize(
           stream:,
           formatter:,
           level: DEFAULT_LEVEL,

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
@@ -64,7 +53,9 @@ module Dry
           severity: "FATAL",
           progname: progname,
           time: Time.now,
-          log_entry: [message, payload].map(&:to_s).reject(&:empty?).join(SEPARATOR),
+          log_entry: [message, payload].map { |s|
+            s.to_s.encode("UTF-8", invalid: :replace, undef: :replace, replace: "?")
+          }.reject(&:empty?).join(SEPARATOR),
           exception: exception.class,
           message: exception.message,
           backtrace: TAB + exception.backtrace.join(NEW_LINE + TAB)
@@ -86,21 +77,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 +209,7 @@ module Dry
             clock: clock,
             progname: progname,
             severity: severity,
-            tags: @tags,
+            tags: current_tags,
             message: message,
             payload: {**context, **payload}
           )
@@ -244,7 +227,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 +256,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 +308,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/entry.rb

@@ -44,7 +44,6 @@ module Dry
 
       # @since 1.0.0
       # @api private
-      # rubocop:disable Metrics/ParameterLists
       def initialize(clock:, progname:, severity:, tags: EMPTY_ARRAY, message: nil,
                      payload: EMPTY_HASH)
         @clock = clock

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/formatters/template.rb

@@ -68,8 +68,19 @@ module Dry
 
         # @since 1.0.0
         # @api private
-        def %(tokens)
-          output = value % tokens
+        def %(other)
+          begin
+            output = value % other
+          rescue Encoding::CompatibilityError
+            sanitized_tokens = other.transform_values { |v|
+              if v.respond_to?(:encode)
+                v.encode("UTF-8", invalid: :replace, undef: :replace, replace: "?")
+              else
+                v
+              end
+            }
+            output = value % sanitized_tokens
+          end
           output.strip!
           output.split(NEW_LINE).map(&:rstrip).join(NEW_LINE)
         end

data/lib/dry/logger/version.rb

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

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: dry-logger
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Hanakai team
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-05 00:00:00.000000000 Z
+date: 1980-01-02 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
@@ -58,9 +71,9 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
 - CHANGELOG.md
 - LICENSE
+- README.md
 files:
 - CHANGELOG.md
 - LICENSE
@@ -76,6 +89,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
@@ -94,7 +108,6 @@ metadata:
   source_code_uri: https://github.com/dry-rb/dry-logger
   bug_tracker_uri: https://github.com/dry-rb/dry-logger/issues
   funding_uri: https://github.com/sponsors/hanami
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -109,8 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Lightweight structured logging for Ruby applications
 test_files: []