lumberjack_rails 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edd85e0decd631de57496388c52f62d317491ce1cfe60af7cda3156137214928
-  data.tar.gz: f05e7cc61c5c8a6a3569075a235e4db3b037a82fd3ad8ffefa6c21861779fca1
+  metadata.gz: 3a3a13074830f25a5060ee4d39cb6dd8fa3796c11071f6b2612690b418c22aaf
+  data.tar.gz: e4716c659a0c73f9894e22cda0acb2048af45d91b0dfd5e7944475d2603733fc
 SHA512:
-  metadata.gz: 7b7f0a126c83f4af4ac21edef41ba166d0d8936247f7e61af41ecae0d345ca5d4c2ee9a89046d9215f975b2cf706e9d6995050cada97ce6e9117f9304892cf90
-  data.tar.gz: 857aadca551194218c9dc9f1b4d7670a4654040c6426ba726aada4cfd08fee471ff7af4cb8713f02fa80cf78f97f140e163eb350f9dc901a647cb739caacf0c6
+  metadata.gz: 4332df5d1d72807b12e5037a3617fc2bf44fe82a42187f0b0205120fe39905297896eb158b134aff5bb62fb8d6b4cf9489034b393c58115208a7878acb4bfc6f
+  data.tar.gz: 636dc7aeb27053785c986ec699ce5ac7ec7eb5b456e0d71a26a2ab4561fdc530943161bfeae1a49f8306d2a4ed4956006b8f4a75396156b89451c1ac7c2ae45a

data/.github/dependabot.yml

@@ -1,4 +1,3 @@
-# Dependabot update strategy
 version: 2
 updates:
   - package-ecosystem: bundler
@@ -6,7 +5,10 @@ updates:
     schedule:
       interval: weekly
     allow:
-      # Automatically keep all runtime dependencies updated
       - dependency-name: "*"
         dependency-type: "production"
-    versioning-strategy: lockfile-only
+    versioning-strategy: increase-if-necessary
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly

data/.github/workflows/continuous_integration.yml

@@ -10,12 +10,6 @@ on:
       - actions-*
   workflow_dispatch:
 
-env:
-  BUNDLE_CLEAN: "true"
-  BUNDLE_PATH: vendor/bundle
-  BUNDLE_JOBS: 3
-  BUNDLE_RETRY: 3
-
 jobs:
   build:
     name: build ruby-${{ matrix.ruby }} ${{ matrix.appraisal }}
@@ -38,33 +32,16 @@ jobs:
           - ruby: "ruby"
             appraisal: no_rails
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up Ruby ${{ matrix.ruby }}
-        uses: ruby/setup-ruby@v1
+      - name: Checkout
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+      - name: Ruby CI
+        uses: bdurand/github-actions/ruby-ci@v1.0.4
         with:
-          ruby-version: "${{ matrix.ruby }}"
-      - name: Install packages
-        run: |
-          sudo apt-get update
-          sudo apt-get install libsqlite3-dev
-      - name: Setup bundler
-        if: matrix.bundler != ''
-        run: |
-          gem uninstall bundler --all
-          gem install bundler --no-document --version ${{ matrix.bundler }}
-      - name: Set Appraisal bundle
-        if: matrix.appraisal != ''
-        run: |
-          echo "using gemfile gemfiles/${{ matrix.appraisal }}.gemfile"
-          bundle config set gemfile "gemfiles/${{ matrix.appraisal }}.gemfile"
-      - name: Install gems
-        run: |
-          bundle update
-      - name: Run Tests
-        run: bundle exec rake
-      - name: standardrb
-        if:   matrix.standardrb == true
-        run:  bundle exec standardrb
-      - name: yard
-        if: matrix.yard == true
-        run:  bundle exec yard --fail-on-warning
+          ruby: ${{ matrix.ruby }}
+          appraisal: ${{ matrix.appraisal }}
+          bundler: ${{ matrix.bundler }}
+          standardrb: ${{ matrix.standardrb }}
+          yard: ${{ matrix.yard }}
+          frozen_strings: ${{ matrix.frozen_strings }}

data/.standard.yml

@@ -3,7 +3,4 @@ ruby_version: 3.0
 format: progress
 
 ignore:
-  - 'spec/**/*':
-    - Lint/UselessAssignment
-    - Lint/Void
   - 'test_app/**/*'

data/CHANGE_LOG.md

@@ -4,6 +4,27 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.0.2
+
+### Changed
+
+- Bumped the minimum lumberjack version dependency to 2.1.
+
+### Removed
+
+- Removed `untagged` and `set_progname` from `ActiveSupport::BroadcastLogger`. Both methods were removed from `Lumberjack::Logger` in lumberjack 2.1, so the broadcast versions no longer had anything to dispatch to. Use `clear_attributes` instead of `untagged` and `with_progname` instead of `set_progname`.
+
+### Fixed
+
+- Fixed local log levels set with `silence` and `log_at` bleeding between unrelated loggers. ActiveSupport 8.1 sets the key used to store the local log level in the logger constructor, which Lumberjack loggers do not call, so all loggers were sharing a single local level per thread.
+- Forked loggers now share the ActiveSupport local log level with their parent logger so that calling `silence` or `log_at` on the main logger applies to log subscriber loggers forked from it.
+- `ActiveSupport::BroadcastLogger#local_level` now reads from the broadcasted loggers on ActiveSupport versions prior to 8.1 so that `silence` and `log_at` behave consistently across versions.
+- `ActiveSupport::BroadcastLogger#add` now coerces the severity with `Lumberjack::Severity` so that Lumberjack-specific severities like `:trace` work and so that it does not depend on `Logger::Severity.coerce`, which only exists in logger gem 1.6 and later.
+- `tagged` on a forked logger now executes the block even when the parent logger does not support tagged logging. Previously the block was silently skipped.
+- Fixed typo in the Railtie that failed to exclude `config.lumberjack.request_attributes_proc` from the options passed to the logger constructor.
+- The Railtie no longer mutates the `config.lumberjack.attributes` hash and no longer copies dynamic `config.log_tags` values (Symbols and Procs) as static logger attributes. Dynamic tags are evaluated per request by `Rails::Rack::Logger` and were being logged as literal values on entries outside of requests.
+- `ActionController::LogSubscriber.add_process_log_attribute` now handles a static value of `false` correctly instead of storing `nil`.
+
 ## 1.0.1
 
 ### Changed

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/lumberjack/rails/action_controller_log_subscriber_extension.rb

@@ -37,9 +37,9 @@ module Lumberjack::Rails
       # @return [void]
       def add_process_log_attribute(name, value = nil, &block)
         raise ArgumentError.new("Must provide a value or a block") if value.nil? && block.nil?
-        raise ArgumentError.new("Cannot provide both a value and a block") if value && block
+        raise ArgumentError.new("Cannot provide both a value and a block") if !value.nil? && block
 
-        @lumberjack_process_log_attributes[name.to_s] = value || block
+        @lumberjack_process_log_attributes[name.to_s] = block || value
       end
 
       # Add log attributes to be included in the process_action log entry. The block must

data/lib/lumberjack/rails/apply_patches.rb

@@ -16,9 +16,9 @@
 # backward compatibility with existing Rails logging patterns.
 
 # Remove deprecated methods on Lumberjack::Logger that are implemented by ActiveSupport
-Lumberjack::Logger.remove_method(:tagged) if Lumberjack::Logger.instance_methods.include?(:tagged)
-Lumberjack::Logger.remove_method(:log_at) if Lumberjack::Logger.instance_methods.include?(:log_at)
-Lumberjack::Logger.remove_method(:silence) if Lumberjack::Logger.instance_methods.include?(:silence)
+Lumberjack::Logger.remove_method(:tagged) if Lumberjack::Logger.method_defined?(:tagged)
+Lumberjack::Logger.remove_method(:log_at) if Lumberjack::Logger.method_defined?(:log_at)
+Lumberjack::Logger.remove_method(:silence) if Lumberjack::Logger.method_defined?(:silence)
 
 # Add tagged logging support to the Lumberjack::EntryFormatter
 Lumberjack::EntryFormatter.prepend(Lumberjack::Rails::TaggedLoggingFormatter)

data/lib/lumberjack/rails/broadcast_logger_extension.rb

@@ -100,7 +100,7 @@ module Lumberjack
       # @yield optional block that returns the message
       # @return [void]
       def add(severity, message_or_progname_or_attributes = nil, progname_or_attributes = nil, &block)
-        severity = Logger::Severity.coerce(severity)
+        severity = Lumberjack::Severity.coerce(severity)
         dispatch_to_each(block) do |logger, one_time_block|
           call_add_with_attributes_arg(logger, severity, message_or_progname_or_attributes, progname_or_attributes, &one_time_block)
         end
@@ -117,6 +117,25 @@ module Lumberjack
         log_at(level, &block)
       end
 
+      # Get the local log level from the broadcasted loggers. ActiveSupport 8.1 added
+      # this method to BroadcastLogger; it is defined here so that silence and log_at
+      # work consistently on older versions of ActiveSupport as well.
+      #
+      # @return [Integer, nil] the local log level
+      def local_level
+        broadcasts.filter_map { |logger| logger.local_level if logger.respond_to?(:local_level) }.first
+      end
+
+      # Set the local log level on all broadcasted loggers that support it.
+      #
+      # @param level [Integer, Symbol, nil] the local log level
+      # @return [void]
+      def local_level=(level)
+        broadcasts.each do |logger|
+          logger.local_level = level if logger.respond_to?(:local_level=)
+        end
+      end
+
       # Tag log entries with the specified attributes.
       #
       # @param attributes [Hash] the attributes to tag with
@@ -160,14 +179,6 @@ module Lumberjack
         dispatch_block_method(:clear_attributes, &block)
       end
 
-      # Execute a block without any tags.
-      #
-      # @yield the block to execute without tags
-      # @return [Object] the result of the block execution
-      def untagged(&block)
-        dispatch_block_method(:untagged, &block)
-      end
-
       # Set the progname temporarily for a block.
       #
       # @param value [String] the progname to set
@@ -177,15 +188,6 @@ module Lumberjack
         dispatch_block_method(:with_progname, value, &block)
       end
 
-      # Alias for with_progname for backward compatibility.
-      #
-      # @param value [String] the progname to set
-      # @yield the block to execute with the specified progname
-      # @return [Object] the result of the block execution
-      def set_progname(value, &block)
-        dispatch_block_method(:with_progname, value, &block)
-      end
-
       # Create a forked logger from this broadcast logger.
       #
       # @param level [Symbol, Integer] optional log level for the forked logger

data/lib/lumberjack/rails/log_at_level.rb

@@ -14,6 +14,15 @@ module Lumberjack
       def level
         local_level || super
       end
+
+      private
+
+      # ActiveSupport::LoggerThreadSafeLevel#initialize sets this key, but Lumberjack
+      # loggers never call super in their constructors, so without this override every
+      # logger would share the nil key and local levels would bleed between loggers.
+      def local_level_key
+        @local_level_key ||= :"logger_thread_safe_level_#{object_id}"
+      end
     end
   end
 end

data/lib/lumberjack/rails/railtie.rb

@@ -77,10 +77,15 @@ class Lumberjack::Rails::Railtie < ::Rails::Railtie
       level = config.lumberjack.level || config.log_level || :debug
 
       # Set default attributes
-      attributes = config.lumberjack.attributes
+      attributes = config.lumberjack.attributes&.dup
       if config.log_tags
-        attributes ||= {}
-        attributes["tags"] = config.log_tags
+        # Symbol and Proc tags are evaluated per request by Rails::Rack::Logger, so only
+        # static tag values can be applied as default attributes on the logger itself.
+        static_tags = config.log_tags.reject { |tag| tag.is_a?(Symbol) || tag.respond_to?(:call) }
+        unless static_tags.empty?
+          attributes ||= {}
+          attributes["tags"] = static_tags
+        end
       end
 
       shift_age = config.lumberjack.shift_age || 0
@@ -97,7 +102,7 @@ class Lumberjack::Rails::Railtie < ::Rails::Railtie
         :shift_size,
         :log_rake_tasks,
         :middleware,
-        :request_attribute,
+        :request_attributes_proc,
         :silence_rack_request_started
       )
 

data/lib/lumberjack/rails/tagged_forked_logger.rb

@@ -5,16 +5,44 @@ module Lumberjack
     # Extension for Lumberjack::ForkedLogger to support ActiveSupport tagged logging.
     #
     # This module adds tagged logging capabilities to forked loggers by
-    # delegating tagged calls to the parent logger when available.
+    # delegating tagged calls to the parent logger when available. It also
+    # shares the ActiveSupport local log level (used by silence and log_at)
+    # with the parent logger so that silencing the parent silences the fork.
     module TaggedForkedLogger
       # Execute a block with the specified tags if the parent logger supports tagging.
+      # If the parent logger does not support tagging, the block is still executed
+      # without any tags applied.
       #
       # @param tags [Array] the tags to apply during block execution
       # @yield the block to execute with the specified tags
-      # @return [Object] the result of the block execution, or nil if parent doesn't support tagging
+      # @return [Object] the result of the block execution
       def tagged(*tags, &block)
         if parent_logger.respond_to?(:tagged)
           parent_logger.tagged(*tags, &block)
+        elsif block
+          block.call
+        else
+          self
+        end
+      end
+
+      # Get the local log level from the parent logger so that silence and log_at
+      # on the parent apply to log entries written through the forked logger.
+      #
+      # @return [Integer, nil] the local log level
+      def local_level
+        parent_logger.respond_to?(:local_level) ? parent_logger.local_level : super
+      end
+
+      # Set the local log level on the parent logger.
+      #
+      # @param value [Integer, Symbol, nil] the local log level
+      # @return [void]
+      def local_level=(value)
+        if parent_logger.respond_to?(:local_level=)
+          parent_logger.local_level = value
+        else
+          super
         end
       end
     end

data/lib/lumberjack/rails.rb

@@ -15,7 +15,6 @@ module Lumberjack
     VERSION = ::File.read(::File.join(__dir__, "..", "..", "VERSION")).strip.freeze
 
     @silence_rack_request_started = false
-    @silenced_log_events = Set.new
 
     class << self
       # Safely wrap Rails.logger with a Lumberjack context.

data/lumberjack_rails.gemspec

@@ -35,6 +35,6 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 3.0"
 
-  spec.add_dependency "lumberjack", ">=2.0.3"
+  spec.add_dependency "lumberjack", ">= 2.1"
   spec.add_dependency "activesupport", ">= 7.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: lumberjack_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Brian Durand
 bindir: bin
 cert_chain: []
-date: 2025-11-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lumberjack
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Support for using the lumberjack logging library in Rails applications.
 test_files: []