epilog 0.8.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 034ff527f27b5bc41a2d055b3224afb73fdadc95e7c0b1fd2df86c86cc71db02
-  data.tar.gz: '010087e2788e3f9e5e3a2550ab3f5dc415924bbdd777846483b650786c6f8547'
+  metadata.gz: e0f45daf54940c2e7449ae321341278f537f642429728a646339d0ad057ff933
+  data.tar.gz: ffade4ca680a3908a8d9c6c5912647881420d217dfeffbfd4e843195df62e30c
 SHA512:
-  metadata.gz: 7692d82f84ac6416fc7c1ae6ef98e2b67b15e3033799c567c2899b7684507cfd06a30133fbdb3d35b5a0184e7f4af1c8c95da7345db7a5e96caae121b2c29163
-  data.tar.gz: 49e8232ee95b2435377b80eae597f39d0e95e82b7e848cd4619814cefbf3bdccff4b5b8e224b7166291675aec40b963d244a29abbfb4f516ef7a6d128db4f58f
+  metadata.gz: 60d208d4fa4e7bf3b8948e2888bda13ed4cf052bb23719f9fcc8e510166a8486eb0318b668377b388e732b932ba756a76aa6d4295fbda517c44bb506c6b0a381
+  data.tar.gz: dbe0e0a0d5dcd03b20fa0ef1ea87241745dba275e2297d9cba1cd34135b30bc602bf9aac1e9994070696bcd36b9e2b6343d8dff9dadc658285fe95a9461c9d16

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.9.2
+
+- Fix double log issue in Rails 7.1+
+
+## 0.9.1
+
+- Remove Rails 8 from CI
+
+## 0.9.0
+
+- Add support for Rails 7.0 and Rails 7.1
+- Drop support for Rails < 7.0
+- Drop support for Ruby < 3.3
+- Update dev and runtime dependencies
+
 ## 0.8.0
 
 - Update license to MIT [#19](https://github.com/nullscreen/epilog/pull/19)

data/lib/epilog/filter/blacklist.rb

@@ -13,7 +13,7 @@ module Epilog
       attr_reader :blacklist
 
       def initialize(blacklist = DEFAULT_BLACKLIST)
-        @blacklist = blacklist.map { |b| [b.to_s.downcase, nil] }.to_h
+        @blacklist = blacklist.to_h { |b| [b.to_s.downcase, nil] }
         super()
       end
 

data/lib/epilog/filter/filter_parameters.rb

@@ -8,9 +8,9 @@ module Epilog
       def filter_parameters
         return @filter_parameters if @filter_parameters
 
-        filtered = ::Rails.application.config.filter_parameters.map do |p|
+        filtered = ::Rails.application.config.filter_parameters.to_h do |p|
           [p.to_s.downcase, true]
-        end.to_h
+        end
 
         @filter_parameters = filtered if ::Rails.initialized?
         filtered

data/lib/epilog/mock_logger.rb

@@ -2,8 +2,8 @@
 
 module Epilog
   class MockLogger < ::Logger
-    def initialize(**options)
-      super(nil, **options)
+    def initialize(**)
+      super(nil, **)
       reset
     end
 

data/lib/epilog/rails/action_controller_subscriber.rb

@@ -88,7 +88,7 @@ module Epilog
         info do
           {
             message: response_string(event),
-            request: request,
+            request:,
             response: response_hash(event),
             metrics: process_metrics(event.payload[:metrics]
               .merge(request_runtime: event.duration.round(2)))
@@ -158,7 +158,7 @@ module Epilog
 
       def basic_message(event, message)
         {
-          message: message,
+          message:,
           metrics: process_metrics(duration: event.duration)
         }
       end

data/lib/epilog/rails/action_view_subscriber.rb

@@ -19,7 +19,7 @@ module Epilog
 
       def hash(event, message)
         {
-          message: message,
+          message:,
           template: fix_path(event.payload[:identifier]),
           layout: fix_path(event.payload[:layout]),
           metrics: {

data/lib/epilog/rails/active_job_subscriber.rb

@@ -75,7 +75,7 @@ module Epilog
 
       def event_hash(message, event)
         {
-          message: message,
+          message:,
           job: job_hash(event.payload[:job]),
           adapter: adapter_name(event.payload[:adapter])
         }

data/lib/epilog/rails/active_record_subscriber.rb

@@ -6,7 +6,7 @@ module Epilog
       IGNORE_PAYLOAD_NAMES = %w[SCHEMA EXPLAIN].freeze
 
       def sql(event)
-        ActiveRecord::LogSubscriber.runtime += event.duration
+        ActiveRecord::RuntimeRegistry.sql_runtime = (ActiveRecord::RuntimeRegistry.sql_runtime || 0) + event.duration
 
         return unless logger.debug?
 

data/lib/epilog/rails/ext/action_controller.rb

@@ -5,29 +5,27 @@ module Epilog
     def process_action(*)
       epilog_instrument('request_received')
       epilog_instrument('process_request') do |payload|
-        begin
-          super
-        ensure
-          payload[:response] = response
-          payload[:metrics] = epilog_metrics
-        end
+        super
+      ensure
+        payload[:response] = response
+        payload[:metrics] = epilog_metrics
       end
     end
 
     private
 
-    def epilog_instrument(name, &block)
+    def epilog_instrument(name, &)
       ActiveSupport::Notifications.instrument(
         "#{name}.action_controller",
         epilog_payload,
-        &block
+        &
       )
     end
 
     def epilog_payload
       {
-        request: request,
-        response: response,
+        request:,
+        response:,
         controller: self.class.name,
         action: action_name,
         context: epilog_context
@@ -37,7 +35,7 @@ module Epilog
     def epilog_metrics
       {
         db_runtime: try(:db_runtime),
-        view_runtime: view_runtime
+        view_runtime:
       }
     end
 

data/lib/epilog/rails/ext/active_support_logger.rb

@@ -1,16 +1,21 @@
 # frozen_string_literal: true
 
-module ActiveSupport
-  class Logger
-    # Rails uses this method to attach additional loggers to the main
-    # Rails.logger object when using the rails console or server. This results
-    # in extra unformatted log output in those cases. Prevent that by
-    # overriding the method with a stub. Examples can be found in
-    #
-    # - railties/lib/rails/commands/server.rb
-    # - active_record/lib/active_record/railtie.rb
-    def self.broadcast(*_args)
-      Module.new
+# For Rails 7.1+, the broadcast_to patch is applied in the railtie's
+# after_initialize block (see railtie.rb) to ensure the BroadcastLogger
+# class is fully defined before we patch it.
+if ::Rails.gem_version < Gem::Version.new('7.1')
+  module ActiveSupport
+    class Logger
+      # Rails uses this method to attach additional loggers to the main
+      # Rails.logger object when using the rails console or server. This results
+      # in extra unformatted log output in those cases. Prevent that by
+      # overriding the method with a stub. Examples can be found in
+      #
+      # - railties/lib/rails/commands/server.rb
+      # - active_record/lib/active_record/railtie.rb
+      def self.broadcast(*_args)
+        Module.new
+      end
     end
   end
 end

data/lib/epilog/rails/ext/event_delegate.rb

@@ -3,10 +3,13 @@
 module Epilog
   module EventDelegateExt
     # Rails has no public API to determine the delegate for an event
-    # object. Add this method to allow checking if the delegate matches
-    # a given object.
-    def delegates_to?(delegate)
-      @delegate == delegate
+    # object. Add these methods to allow checking the delegate.
+    def delegate
+      @delegate
+    end
+
+    def delegates_to?(other)
+      @delegate == other
     end
   end
 end

data/lib/epilog/rails/railtie.rb

@@ -44,8 +44,6 @@ module Epilog
       ]
 
       initializer 'epilog.configure' do |app|
-        disable_rails_defaults
-
         ::Rails.logger ||= Logger.new($stdout)
 
         app.config.epilog.subscriptions.each do |namespace|
@@ -57,28 +55,70 @@ module Epilog
         end
       end
 
-      private
+      # In Rails 7.1+, the server, console, and other components (like Sidekiq)
+      # call Rails.logger.broadcast_to() to add additional log destinations.
+      # This causes duplicate log lines and can lead to blocks being executed
+      # multiple times (via BroadcastLogger's method_missing delegation).
+      #
+      # This initializer runs AFTER :initialize_logger (which wraps the logger
+      # in a BroadcastLogger) but BEFORE any after_initialize hooks (where
+      # Sidekiq and others add their loggers). This ensures the no-op is in
+      # place before anyone tries to call broadcast_to.
+      initializer 'epilog.prevent_broadcast', after: :initialize_logger do
+        if ::Rails.gem_version >= Gem::Version.new('7.1') && ::Rails.logger
+          ::Rails.logger.define_singleton_method(:broadcast_to) { |*| nil }
+        end
+      end
+
+      # In Rails 7.1+, ActionView::LogSubscriber::Start are attached late
+      # in the initialization process, so we need to disable them after
+      # initialization completes
+      config.after_initialize do
+        disable_rails_defaults
+      end
+
+      class << self
+        private
 
-      def disable_rails_defaults
-        blacklisted_subscribers.each do |subscriber|
-          subscriber.patterns.each do |pattern|
-            unsubscribe_listeners(subscriber, pattern)
+        def disable_rails_defaults
+          blacklisted_subscribers.each do |subscriber|
+            subscriber.patterns.each do |pattern|
+              unsubscribe_listeners(subscriber, pattern)
+            end
           end
+
+          # Rails 7.1 adds ActionView::LogSubscriber::Start which subscribes
+          # separately and logs "Rendering..." messages at the start of rendering
+          # see https://github.com/rails/rails/commit/9c58a54702b038b9acebdb3efa85c26156ff1987#diff-fd389a9f74e2259b56015e3f8d15a5ce33c093045dd4cb354e82d6d81fe9b06aR98-R99
+          unsubscribe_action_view_start_listeners
         end
-      end
 
-      def unsubscribe_listeners(subscriber, pattern)
-        notifier = ActiveSupport::Notifications.notifier
-        notifier.listeners_for(Array.wrap(pattern).first).each do |listener|
-          if listener.delegates_to?(subscriber)
-            ActiveSupport::Notifications.unsubscribe(listener)
+        def unsubscribe_listeners(subscriber, pattern)
+          notifier = ActiveSupport::Notifications.notifier
+          notifier.listeners_for(Array.wrap(pattern).first).each do |listener|
+            if listener.delegates_to?(subscriber)
+              ActiveSupport::Notifications.unsubscribe(listener)
+            end
           end
         end
-      end
 
-      def blacklisted_subscribers
-        ActiveSupport::LogSubscriber.log_subscribers.select do |subscriber|
-          SUBSCRIBER_BLACKLIST.include?(subscriber.class)
+        def unsubscribe_action_view_start_listeners
+          return unless defined?(ActionView::LogSubscriber::Start)
+
+          notifier = ActiveSupport::Notifications.notifier
+          %w[render_template.action_view render_layout.action_view].each do |pattern|
+            notifier.listeners_for(pattern).each do |listener|
+              if listener.delegate.is_a?(ActionView::LogSubscriber::Start)
+                ActiveSupport::Notifications.unsubscribe(listener)
+              end
+            end
+          end
+        end
+
+        def blacklisted_subscribers
+          ActiveSupport::LogSubscriber.log_subscribers.select do |subscriber|
+            SUBSCRIBER_BLACKLIST.include?(subscriber.class)
+          end
         end
       end
     end

data/lib/epilog/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Epilog
-  VERSION = '0.8.0'
+  VERSION = '0.9.2'
 
   def self.version
     Gem::Version.new(VERSION)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epilog
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Justin Howard
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-10 00:00:00.000000000 Z
+date: 2026-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: combustion
@@ -31,9 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -41,9 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -62,31 +56,31 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-description: 
+        version: '1.4'
+description:
 email:
 - jmhoward0@gmail.com
 executables: []
@@ -126,9 +120,9 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/nullscreen/epilog/blob/main/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/epilog/0.8.0
+  documentation_uri: https://www.rubydoc.info/gems/epilog/0.9.2
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -136,15 +130,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: A JSON logger with Rails support
 test_files: []