logtail-rails 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7123b2162f46a2a107ead8671135561f7a5d53f49a66196f4684776ad14a7c5
-  data.tar.gz: 749ff8b0d6367026632cb6beee6a5742168aeb0b038d87b786ae683472c83409
+  metadata.gz: 4d238560ec59e0d1b0d936ae0b3b92e11865ba2e80fcc4adeb4d6cb43676c7ae
+  data.tar.gz: 97e280b2a2c9297a0862dbbd733a4a36e902928b749be07bed9c904243a167f9
 SHA512:
-  metadata.gz: 248ef31c5d69238893ce2b0e8c0d1bc5de1a9edd94df498da0c2ef61dbe608ff0cfb2761c390eb18e70b24481bfc8455750d99340d539aed84c21feebf53d3b9
-  data.tar.gz: fe08fa5eba61b5908202ea011153721b02c703d239cc78b7edc0d76484debb5e80faddeaa4d2bdf41fde63190dd4fec068e705262326e5829d2de683256f10ab
+  metadata.gz: bc9b5ab10bb6cb45a9896a1056399c5adb5a8297cc06d7b424bd077884ff3848c6892d526004a2c3dc620ff4b2ce0505fc589be9c0d3b4d60485fd8165b7d5eb
+  data.tar.gz: 2cbd54fa234e026c71feba8f050e41d6a5b5ae513b806548921943bade86665248a826274d949924b4607a7ce1e72e2fb31137629991ac3cf3c30f59c3d5983c

data/.github/workflows/main.yml

@@ -27,6 +27,7 @@ jobs:
           - truffleruby-23.0.0
           - truffleruby-22.1.0
         gemfile:
+          - rails-edge
           - rails-7.0
           - rails-6.1
           - rails-6.0
@@ -34,6 +35,17 @@ jobs:
           - 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

data/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 => '../'

data/lib/logtail-rails/action_controller/log_subscriber.rb

@@ -7,6 +7,7 @@ module Logtail
       # @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

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

@@ -25,6 +25,7 @@ module Logtail
               )
             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 @@ module Logtail
             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

data/lib/logtail-rails/active_support_log_subscriber.rb

@@ -18,6 +18,11 @@ module Logtail
         # 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

data/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logtail-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Better Stack
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-14 00:00:00.000000000 Z
+date: 2023-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logtail
@@ -306,6 +306,7 @@ files:
 - gemfiles/rails-6.0.gemfile
 - gemfiles/rails-6.1.gemfile
 - gemfiles/rails-7.0.gemfile
+- gemfiles/rails-edge.gemfile
 - lib/logtail-rails.rb
 - lib/logtail-rails/action_controller.rb
 - lib/logtail-rails/action_controller/log_subscriber.rb