Support Rails edge version (7.1), add to CI checks (#24)

Author: PetrHeinz

.github/workflows/main.yml

@@ -27,13 +27,25 @@ jobs:
           - truffleruby-23.0.0
           - truffleruby-22.1.0
         gemfile:
+          - rails-edge
           - rails-7.0
           - rails-6.1
           - rails-6.0
           - rails-5.2
           - rails-5.1
           - rails-5.0
         exclude:
+          - gemfile: rails-edge
+            ruby-version: 2.6.6
+          - gemfile: rails-edge
+            ruby-version: 2.5.8
+          - gemfile: rails-edge
+            ruby-version: jruby-9.4.3.0
+          - gemfile: rails-edge
+            ruby-version: jruby-9.2.14.0
+          - gemfile: rails-edge
+            ruby-version: truffleruby-23.0.0
+
           - gemfile: rails-7.0
             ruby-version: 2.6.6
           - gemfile: rails-7.0

gemfiles/rails-edge.gemfile

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gem 'rails', github: 'rails/rails', branch: 'main'
+
+gem 'logtail'
+gem 'logtail-rack'
+
+if RUBY_PLATFORM == "java"
+  gem 'mime-types', '2.6.2'
+end
+
+gemspec :path => '../'

lib/logtail-rails/action_controller/log_subscriber.rb

@@ -7,6 +7,7 @@ module ActionController
       # @private
       class LogSubscriber < Integrator
         def initialize
+          require "action_controller"
           require "action_controller/log_subscriber"
           require "logtail-rails/action_controller/log_subscriber/logtail_log_subscriber"
         rescue LoadError => e

lib/logtail-rails/action_view/log_subscriber/logtail_log_subscriber.rb

@@ -25,6 +25,7 @@ def render_template(event)
               )
             end
           end
+          subscribe_log_level :render_template, :info if defined?(subscribe_log_level)
 
           def render_partial(event)
             return true if silence?
@@ -66,6 +67,18 @@ def render_collection(event)
             end
           end
 
+          def self.attach_to(*)
+            super
+
+            if ::Rails::VERSION::MAJOR > 7 || ::Rails::VERSION::MAJOR == 7 && ::Rails::VERSION::MINOR >= 1
+              # Clean extra listeners subscribed in parent's attach_to method
+              ::ActiveSupport::Notifications.notifier.listeners_for("render_template.action_view")
+                .concat(::ActiveSupport::Notifications.notifier.listeners_for("render_layout.action_view")).flatten
+                .filter { |listener| listener.delegate.class == ::ActionView::LogSubscriber::Start }
+                .each { |listener| ActiveSupport::Notifications.unsubscribe(listener) }
+            end
+          end
+
           private
           def log_rendering_start(*args)
             # Consolidates 2 template rendering events into 1. We don't need 2 events for

lib/logtail-rails/active_support_log_subscriber.rb

@@ -18,6 +18,11 @@ def subscribed?(component, type)
         # I don't know why this has to be so complicated, but it is. This code was taken from
         # lograge :/
         def unsubscribe!(component, type)
+          if defined?(type.detach_from)
+            type.detach_from(component)
+            return
+          end
+
           subscriber = find(component, type)
 
           if !subscriber

lib/logtail-rails/version.rb

@@ -1,7 +1,7 @@
 module Logtail
   module Integrations
     module Rails
-      VERSION = "0.2.3"
+      VERSION = "0.2.4"
     end
   end
 end