logtail-rails 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84163f336f6b5a4a1ba19dd718853f056c84f8aa37833a1e627eac0807c029a9
-  data.tar.gz: d4449b68f74462513787e701cbadc68e9db7951844f6422d25a26e2d3dcada8b
+  metadata.gz: 199f2f2bf589ef69bbe057b16224aa71999e45e991e30eeda9533f11ce233c79
+  data.tar.gz: 26603038e5aa56d21112ce259084999f4cf29df2eab4b1b411f13d0cef6ae246
 SHA512:
-  metadata.gz: ceeefbafaf65054cb6cdc66438f456d5f0b69d82f89c0103ea4550445540785e1ca8b3791ac972ee96352bd210c9a3bd03d88575c93746a14e707b834653341a
-  data.tar.gz: 338066840792cbf30875b7e355ef31c93cfdb87d4090d24e03d8230b56b898c83d743c5ea45475c161111c334621c5d23d0ff2344457cc376175df92c010df2e
+  metadata.gz: fb36a1279648ec39acebf782e59b26441824b1222152ba76c44cc7454ae0593eaece3beca230d3e305ae803e4215c958a3f51e5cadb962ee3592060b45ed8357
+  data.tar.gz: e267ac9f6488ec482c1b84035cb119e6062f3f335e03bedb8eff3cae3fd318a5a5e61dacc560acca8eb53870080a89add3006b7299454b4b2025d1b738d2a4a4

data/.github/workflows/main.yml

@@ -1,22 +1,24 @@
 name: build
 
 on:
-  pull_request:
   push:
     branches: [main]
+  pull_request:
   schedule:
     - cron: '20 5 * * 1'
   workflow_dispatch:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+
+    runs-on: ubuntu-24.04
 
     strategy:
       fail-fast: false
 
       matrix:
         ruby-version:
+          - "4.0"
           - "3"
           - "3.3"
           - "3.2"
@@ -25,12 +27,10 @@ jobs:
           - "2.7"
           - "2.6"
           - "2.5"
-          - "jruby-9.4.3.0"
-          - "jruby-9.2.14.0"
-          - "truffleruby-23.0.0"
-          - "truffleruby-22.1.0"
+          - "truffleruby"
         gemfile:
           - "rails-edge"
+          - "rails-8.1"
           - "rails-8.0"
           - "rails-7.2"
           - "rails-7.1"
@@ -41,6 +41,8 @@ jobs:
           - "rails-5.1"
           - "rails-5.0"
         exclude:
+          - gemfile: "rails-edge"
+            ruby-version: "3.2"
           - gemfile: "rails-edge"
             ruby-version: "3.1"
           - gemfile: "rails-edge"
@@ -51,14 +53,17 @@ jobs:
             ruby-version: "2.6"
           - gemfile: "rails-edge"
             ruby-version: "2.5"
-          - 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-22.1.0"
-          - gemfile: "rails-edge"
-            ruby-version: "truffleruby-23.0.0"
+
+          - gemfile: "rails-8.1"
+            ruby-version: "3.1"
+          - gemfile: "rails-8.1"
+            ruby-version: "3.0"
+          - gemfile: "rails-8.1"
+            ruby-version: "2.7"
+          - gemfile: "rails-8.1"
+            ruby-version: "2.6"
+          - gemfile: "rails-8.1"
+            ruby-version: "2.5"
 
           - gemfile: "rails-8.0"
             ruby-version: "3.1"
@@ -70,14 +75,6 @@ jobs:
             ruby-version: "2.6"
           - gemfile: "rails-8.0"
             ruby-version: "2.5"
-          - gemfile: "rails-8.0"
-            ruby-version: "jruby-9.4.3.0"
-          - gemfile: "rails-8.0"
-            ruby-version: "jruby-9.2.14.0"
-          - gemfile: "rails-8.0"
-            ruby-version: "truffleruby-22.1.0"
-          - gemfile: "rails-8.0"
-            ruby-version: "truffleruby-23.0.0"
 
           - gemfile: "rails-7.2"
             ruby-version: "3.0"
@@ -87,29 +84,19 @@ jobs:
             ruby-version: "2.6"
           - gemfile: "rails-7.2"
             ruby-version: "2.5"
-          - gemfile: "rails-7.2"
-            ruby-version: "jruby-9.4.3.0"
-          - gemfile: "rails-7.2"
-            ruby-version: "jruby-9.2.14.0"
-          - gemfile: "rails-7.2"
-            ruby-version: "truffleruby-22.1.0"
           
           - gemfile: "rails-7.1"
             ruby-version: "2.6"
           - gemfile: "rails-7.1"
             ruby-version: "2.5"
-          - gemfile: "rails-7.1"
-            ruby-version: "jruby-9.4.3.0"
-          - gemfile: "rails-7.1"
-            ruby-version: "jruby-9.2.14.0"
 
           - gemfile: "rails-7.0"
             ruby-version: "2.6"
           - gemfile: "rails-7.0"
             ruby-version: "2.5"
-          - gemfile: "rails-7.0"
-            ruby-version: "jruby-9.2.14.0"
 
+          - gemfile: "rails-5.2"
+            ruby-version: "4.0"
           - gemfile: "rails-5.2"
             ruby-version: "3"
           - gemfile: "rails-5.2"
@@ -121,12 +108,10 @@ jobs:
           - gemfile: "rails-5.2"
             ruby-version: "3.0"
           - gemfile: "rails-5.2"
-            ruby-version: "jruby-9.4.3.0"
-          - gemfile: "rails-5.2"
-            ruby-version: "truffleruby-22.1.0"
-          - gemfile: "rails-5.2"
-            ruby-version: "truffleruby-23.0.0"
+            ruby-version: "truffleruby"
 
+          - gemfile: "rails-5.1"
+            ruby-version: "4.0"
           - gemfile: "rails-5.1"
             ruby-version: "3"
           - gemfile: "rails-5.1"
@@ -138,12 +123,10 @@ jobs:
           - gemfile: "rails-5.1"
             ruby-version: "3.0"
           - gemfile: "rails-5.1"
-            ruby-version: "jruby-9.4.3.0"
-          - gemfile: "rails-5.1"
-            ruby-version: "truffleruby-23.0.0"
-          - gemfile: "rails-5.1"
-            ruby-version: "truffleruby-22.1.0"
+            ruby-version: "truffleruby"
 
+          - gemfile: "rails-5.0"
+            ruby-version: "4.0"
           - gemfile: "rails-5.0"
             ruby-version: "3"
           - gemfile: "rails-5.0"
@@ -155,18 +138,14 @@ jobs:
           - gemfile: "rails-5.0"
             ruby-version: "3.0"
           - gemfile: "rails-5.0"
-            ruby-version: "jruby-9.4.3.0"
-          - gemfile: "rails-5.0"
-            ruby-version: "truffleruby-23.0.0"
-          - gemfile: "rails-5.0"
-            ruby-version: "truffleruby-22.1.0"
+            ruby-version: "truffleruby"
 
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
       RAILS_ENV: test
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v7
 
       - name: Selected Gemfile
         run: echo $BUNDLE_GEMFILE

data/.github/workflows/no-closing-keywords.yml

@@ -0,0 +1,28 @@
+# Issues in this repo are synced with Linear. A GitHub closing keyword ("Closes #123",
+# "Fixes owner/repo#123") closes the issue the moment the PR merges, while Linear's PR
+# automation moves the linked Linear issue to Self QA at the same time. The two automations
+# then fight: the GitHub issue is closed, reopened, and the Linear issue lands in Triage.
+# Reference the issue with "Refs #123" instead and close it from Linear once the fix is
+# released.
+name: no closing keywords
+on:
+  pull_request:
+    types: [opened, edited, reopened, synchronize]
+permissions:
+  pull-requests: read
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Reject GitHub closing keywords in the PR description
+        env:
+          BODY: ${{ github.event.pull_request.body }}
+        run: |
+          pattern='\b(close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)\b:?[[:space:]]+(#[0-9]+|[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+#[0-9]+|https?://github\.com/[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+/issues/[0-9]+)'
+          if matches=$(printf '%s' "$BODY" | grep -inoE "$pattern"); then
+            echo "::error::The PR description contains a GitHub closing keyword, which would close the issue on merge and desync it from Linear:"
+            echo "$matches"
+            echo "Use 'Refs #123' instead and close the issue from Linear once the fix is released."
+            exit 1
+          fi
+          echo "No closing keywords found."

data/.github/workflows/release.yml

@@ -0,0 +1,219 @@
+# Publishes the gem to RubyGems.org from GitHub Actions with trusted publishing (OIDC), the way
+# logtail-js releases the @logtail/* packages to npm. No RubyGems.org API key exists anywhere:
+# the gem on rubygems.org trusts exactly this workflow file, run from this repository in the
+# "rubygems" environment, and the shared account's multi-factor authentication stays as it is.
+#
+# One-time setup on rubygems.org, signed in as the gem's owner: the gem's page → Trusted publishers
+# → GitHub Actions, with the repository owner "logtail", this repository's name, the workflow
+# "release.yml" and the environment "rubygems".
+#
+# Repository settings this relies on: the "rubygems" environment with deployment branches limited
+# to main and no required reviewers (add reviewers there if releases should need an approval; a
+# job that references a missing environment would create it WITHOUT protection), and the GitHub
+# Actions app among the actors allowed to bypass the pull request requirement of main, which the
+# version commit needs.
+#
+# Release: Actions → Release → Run workflow from main, pick patch or minor. The workflow runs the
+# tests, bumps the version in lib/*/version.rb, builds the gem, commits "vX.Y.Z", tags it, pushes
+# both, pushes the gem to RubyGems.org and creates a GitHub release with auto-generated notes for
+# the tag; edit the notes afterwards if needed.
+#
+# Retry: if a release failed after the version commit was pushed, run "retry" from main. It bumps
+# nothing, checks out the tag of the version in lib/*/version.rb and rebuilds that commit, pushes
+# the gem if RubyGems.org is still missing it and creates the GitHub release if it is still
+# missing. Running patch or minor again would release the next version instead.
+#
+# Dry run: bumps in place without committing, builds the gem and, on main, exchanges the
+# workflow's OIDC token with RubyGems.org, which proves that the trusted publisher matches this
+# workflow. Nothing is pushed. Every push that touches this file is a dry run, so a change to the
+# workflow proves itself on its pull request before it reaches main, and the push that merges it
+# performs the token exchange as well, because the "rubygems" environment only admits main. A dry
+# run can also be dispatched from any branch.
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      release:
+        description: "patch or minor: bump, tag and publish. retry: finish a release that failed halfway."
+        type: choice
+        options: [patch, minor, retry]
+        required: true
+      dry_run:
+        description: "Dry run: bump and build, verify RubyGems.org accepts this workflow, publish nothing"
+        type: boolean
+        default: false
+  push:
+    paths:
+      - .github/workflows/release.yml
+
+permissions:
+  contents: read
+
+concurrency:
+  group: release
+  cancel-in-progress: false
+
+env:
+  DRY_RUN: ${{ github.event_name == 'push' || inputs.dry_run }}
+  RELEASE: ${{ inputs.release || 'patch' }}
+
+jobs:
+  verify:
+    name: Test
+    runs-on: ubuntu-24.04
+    env:
+      # The root Gemfile cannot load the suite, so the tests run against the newest released Rails.
+      BUNDLE_GEMFILE: gemfiles/rails-8.1.gemfile
+      RAILS_ENV: test
+    steps:
+      - uses: actions/checkout@v7
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3"
+          bundler-cache: true
+
+      - name: Run tests
+        run: bundle exec rspec
+
+  build:
+    name: Bump and build
+    needs: verify
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: write # pushes the version commit and the tag
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+      gem: ${{ steps.build.outputs.gem }}
+
+    steps:
+      - name: Releases run from main only
+        if: ${{ env.DRY_RUN != 'true' && github.ref != 'refs/heads/main' }}
+        run: |
+          echo "::error::Dispatch the release from main, not from $GITHUB_REF_NAME."
+          exit 1
+
+      - uses: actions/checkout@v7
+        with:
+          fetch-depth: 0 # the version check looks at the tags on HEAD
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3"
+
+      - name: Bump version
+        id: version
+        run: |
+          ruby - <<'EOF'
+          release, dry_run = ENV.fetch("RELEASE"), ENV["DRY_RUN"] == "true"
+          path = Dir["lib/**/version.rb"].fetch(0)
+          source = File.read(path)
+          current = source[/VERSION = "(\d+\.\d+\.\d+)"/, 1] || abort("no VERSION constant in #{path}")
+          tagged = `git tag --points-at HEAD`.split.include?("v#{current}")
+
+          if release == "retry"
+            # main may have moved on since the version commit, so build what the tag points at
+            abort("retry only finishes a release whose version v#{current} is tagged") unless system("git", "rev-parse", "-q", "--verify", "refs/tags/v#{current}", out: File::NULL)
+            system("git", "checkout", "-q", "v#{current}") || abort("could not check out v#{current}")
+            version = current
+          else
+            abort("HEAD is already released as v#{current}, there is nothing new to release") if tagged && !dry_run
+            major, minor, patch = current.split(".").map(&:to_i)
+            version = release == "minor" ? "#{major}.#{minor + 1}.0" : "#{major}.#{minor}.#{patch + 1}"
+            File.write(path, source.sub(%("#{current}"), %("#{version}")))
+          end
+
+          puts "#{current} -> #{version}"
+          File.open(ENV.fetch("GITHUB_OUTPUT"), "a") { |output| output.puts "version=#{version}" }
+          EOF
+
+      - name: Build the gem
+        id: build
+        env:
+          VERSION: ${{ steps.version.outputs.version }}
+        run: |
+          git diff --stat
+          gem build *.gemspec
+          gem=$(ls *.gem)
+          case "$gem" in
+            *-"$VERSION".gem) ;;
+            *) echo "::error::Built $gem, expected version $VERSION."; exit 1 ;;
+          esac
+          echo "gem=$gem" >> "$GITHUB_OUTPUT"
+
+      - name: Commit and tag
+        if: ${{ env.DRY_RUN != 'true' && env.RELEASE != 'retry' }}
+        env:
+          VERSION: ${{ steps.version.outputs.version }}
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git commit -am "v$VERSION"
+          git tag -a "v$VERSION" -m "v$VERSION"
+          git push origin main "v$VERSION"
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: gem
+          path: "*.gem"
+          if-no-files-found: error
+
+  release:
+    name: Publish
+    needs: build
+    # The rubygems environment only admits main, so dry runs from other branches stop after the build
+    if: ${{ github.ref == 'refs/heads/main' }}
+    runs-on: ubuntu-24.04
+    environment: rubygems
+    permissions:
+      contents: write # creates the GitHub release
+      id-token: write # OIDC token exchange with RubyGems.org
+    env:
+      VERSION: ${{ needs.build.outputs.version }}
+      GEM: ${{ needs.build.outputs.gem }}
+
+    steps:
+      - uses: actions/download-artifact@v8
+        with:
+          name: gem
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3"
+
+      # Exchanges the job's OIDC token for a short-lived RubyGems.org API key and hands it to
+      # `gem push`. Fails when no trusted publisher on rubygems.org matches this workflow.
+      - uses: rubygems/configure-rubygems-credentials@v2.1.0
+
+      - name: Dry run
+        if: ${{ env.DRY_RUN == 'true' }}
+        run: |
+          ls -l "$GEM"
+          echo "RubyGems.org accepted the OIDC token: the trusted publisher matches this workflow. Nothing is pushed."
+
+      - name: Push to RubyGems.org
+        if: ${{ env.DRY_RUN != 'true' }}
+        run: |
+          name="${GEM%-$VERSION.gem}"
+          if gem specification --remote "$name" --version "$VERSION" > /dev/null 2>&1; then
+            echo "$name $VERSION is on rubygems.org already, finishing the release."
+          else
+            gem push "$GEM"
+          fi
+
+      - name: Create GitHub release
+        if: ${{ env.DRY_RUN != 'true' }}
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GH_REPO: ${{ github.repository }}
+        run: |
+          if gh release view "v$VERSION" > /dev/null 2>&1; then
+            echo "Release v$VERSION already exists."
+          else
+            # --verify-tag: only ever attach to the tag the build job pushed, never create one here.
+            gh release create "v$VERSION" --verify-tag --generate-notes
+          fi

data/gemfiles/rails-7.1.gemfile

@@ -5,6 +5,8 @@ gem 'sidekiq', '>= 7.3.0', require: false if RUBY_VERSION >= '2.7.0'
 
 gem 'logtail'
 gem 'logtail-rack'
+# ActiveSupport passes quirks_mode to JSON.generate until 7.2.4 and 8.1, json 3 no longer accepts it
+gem 'json', '< 3'
 
 if RUBY_PLATFORM == "java"
   gem 'mime-types', '2.6.2'

data/gemfiles/rails-7.2.gemfile

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 7.2.0'
+# 7.2.4 is the first release that works with json 3. Without the floor, Bundler prefers
+# minitest 6 over it and settles for Rails 7.2.3.
+gem 'rails', '~> 7.2.4'
 gem 'sidekiq', '>= 7.3.0', require: false
 
 gem 'logtail'

data/gemfiles/rails-8.0.gemfile

@@ -1,10 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 8.0.0.pre'
+gem 'rails', '~> 8.0.0'
 gem 'sidekiq', '>= 7.3.0', require: false
 
 gem 'logtail'
 gem 'logtail-rack'
-gem "sqlite3", ">= 2.0"
+# ActiveSupport passes quirks_mode to JSON.generate until 7.2.4 and 8.1, json 3 no longer accepts it
+gem 'json', '< 3'
 
 gemspec :path => '../'

data/gemfiles/rails-8.1.gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 8.1.0'
+gem 'sidekiq', '>= 7.3.0', require: false
+
+gem 'logtail'
+gem 'logtail-rack'
+
+gemspec :path => '../'

data/gemfiles/rails-edge.gemfile

@@ -5,7 +5,6 @@ gem 'sidekiq', '>= 7.3.0', require: false if RUBY_VERSION >= '2.7.0'
 
 gem 'logtail'
 gem 'logtail-rack'
-gem "sqlite3", ">= 2.0"
 
 if RUBY_PLATFORM == "java"
   gem 'mime-types', '2.6.2'

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

@@ -9,21 +9,42 @@ module Logtail
         #
         # @private
         class LogtailLogSubscriber < ::ActionController::LogSubscriber
-          def start_processing(event)
-            return true if silence?
+          if ::ActionController::LogSubscriber < ::ActiveSupport::LogSubscriber
+            def start_processing(event)
+              return true if silence?
 
-            info do
-              payload = event.payload
-              params = payload[:params].except(*INTERNAL_PARAMS)
-              format = extract_format(payload)
-              format = format.to_s.upcase if format.is_a?(Symbol)
+              info do
+                payload = event.payload
+                params = payload[:params].except(*INTERNAL_PARAMS)
+                format = extract_format(payload)
+                format = format.to_s.upcase if format.is_a?(Symbol)
 
-              Events::ControllerCall.new(
-                controller: payload[:controller],
-                action: payload[:action],
-                format: format,
-                params: params
-              )
+                Events::ControllerCall.new(
+                  controller: payload[:controller],
+                  action: payload[:action],
+                  format: format,
+                  params: params
+                )
+              end
+            end
+          else
+            # Rails 8.2+ feeds this subscriber from Rails.event: the event is a hash whose
+            # payload already comes without the internal params and with the format upcased.
+            self.namespace = "action_controller"
+
+            def request_started(event)
+              return true if silence?
+
+              info do
+                payload = event[:payload]
+
+                Events::ControllerCall.new(
+                  controller: payload[:controller],
+                  action: payload[:action],
+                  format: payload[:format],
+                  params: payload[:params]
+                )
+              end
             end
           end
 

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

@@ -18,7 +18,7 @@ module Logtail
           return true if Logtail::Integrations::Rails::ActiveSupportLogSubscriber.subscribed?(:action_controller, LogtailLogSubscriber)
 
           Logtail::Integrations::Rails::ActiveSupportLogSubscriber.unsubscribe!(:action_controller, ::ActionController::LogSubscriber)
-          LogtailLogSubscriber.attach_to(:action_controller)
+          Logtail::Integrations::Rails::ActiveSupportLogSubscriber.subscribe!(:action_controller, LogtailLogSubscriber)
         end
       end
     end

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

@@ -7,8 +7,12 @@ module Logtail
         # The intent of this subscriber is to, as transparently as possible, properly
         # track events that are being logged here.
         #
+        # Until Rails 8.1 it extends the default subscriber. Rails 8.2 turned that one into a
+        # subscriber of Rails.event, which receives the rendering events in debug mode only, so
+        # there this subscriber listens to the notifications on its own.
+        #
         # @private
-        class LogtailLogSubscriber < ::ActionView::LogSubscriber
+        class LogtailLogSubscriber < (::ActionView::LogSubscriber < ::ActiveSupport::LogSubscriber ? ::ActionView::LogSubscriber : ::ActiveSupport::LogSubscriber)
           def render_template(event)
             return true if silence?
 
@@ -67,15 +71,25 @@ module Logtail
             end
           end
 
-          def self.attach_to(*)
-            super
+          if superclass == ::ActionView::LogSubscriber
+            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
+          else
+            # The default subscriber used to bring these log levels, the logger and the helpers below
+            subscribe_log_level :render_partial, :debug
+            subscribe_log_level :render_collection, :debug
 
-            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) }
+            def logger
+              ::ActionView::Base.logger
             end
           end
 
@@ -90,6 +104,35 @@ module Logtail
           def silence?
             ActionView.silence?
           end
+
+          unless superclass == ::ActionView::LogSubscriber
+            def from_rails_root(string)
+              string = string.sub(rails_root, "")
+              string.sub!(/^app\/views\//, "")
+              string
+            end
+
+            def rails_root
+              @rails_root ||= "#{::Rails.root}/"
+            end
+
+            def render_count(payload)
+              if payload[:cache_hits]
+                "[#{payload[:cache_hits]} / #{payload[:count]} cache hits]"
+              else
+                "[#{payload[:count]} times]"
+              end
+            end
+
+            def cache_message(payload)
+              case payload[:cache_hit]
+              when :hit
+                "[cache hit]"
+              when :miss
+                "[cache miss]"
+              end
+            end
+          end
         end
       end
     end

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

@@ -17,7 +17,7 @@ module Logtail
           return true if Logtail::Integrations::Rails::ActiveSupportLogSubscriber.subscribed?(:action_view, LogtailLogSubscriber)
 
           Logtail::Integrations::Rails::ActiveSupportLogSubscriber.unsubscribe!(:action_view, ::ActionView::LogSubscriber)
-          LogtailLogSubscriber.attach_to(:action_view)
+          Logtail::Integrations::Rails::ActiveSupportLogSubscriber.subscribe!(:action_view, LogtailLogSubscriber)
         end
       end
     end

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

@@ -13,35 +13,88 @@ module Logtail
         # track events that are being logged here. This LogSubscriber will never change
         # default behavior / log messages.
         #
+        # Until Rails 8.1 it extends the default subscriber. Rails 8.2 turned that one into a
+        # subscriber of Rails.event, which receives the SQL events in debug mode only, so there
+        # this subscriber listens to the notifications on its own.
+        #
         # @private
-        class LogtailLogSubscriber < ::ActiveRecord::LogSubscriber
-          def sql(event)
-            return true if silence?
+        class LogtailLogSubscriber < (::ActiveRecord::LogSubscriber < ::ActiveSupport::LogSubscriber ? ::ActiveRecord::LogSubscriber : ::ActiveSupport::LogSubscriber)
+          if superclass == ::ActiveRecord::LogSubscriber
+            def sql(event)
+              return true if silence?
 
-            r = super(event)
+              r = super(event)
 
-            if @message
-              payload = event.payload
+              if @message
+                payload = event.payload
 
-              sql_event = Events::SQLQuery.new(
-                sql: payload[:sql],
-                duration_ms: event.duration,
-                message: @message,
-              )
+                sql_event = Events::SQLQuery.new(
+                  sql: payload[:sql],
+                  duration_ms: event.duration,
+                  message: @message,
+                )
 
-              logger.debug sql_event
+                logger.debug sql_event
 
-              @message = nil
+                @message = nil
+              end
+
+              r
             end
 
-            r
-          end
+            private
+            def debug(message)
+              @message = message
+            end
+          else
+            require "active_record/structured_event_subscriber"
 
-          private
-          def debug(message)
-            @message = message
+            # Rails 8.2 split ActiveRecord::LogSubscriber#sql in two: a subscriber that turns the
+            # notification into an event for Rails.event, rendering and filtering the binds, and
+            # a log subscriber that formats the event. Both are used here as they are, without
+            # Rails.event between them.
+            class Translation < ::ActiveRecord::StructuredEventSubscriber
+              attr_reader :payload
+
+              def emit_debug_event(name, payload = nil, caller_depth: 1, **kwargs)
+                @payload = payload || kwargs
+              end
+            end
+
+            class Formatting < ::ActiveRecord::LogSubscriber
+              attr_reader :message
+
+              private
+              def debug(message)
+                @message = message
+              end
+            end
+
+            def sql(event)
+              return true if silence?
+
+              translation = Translation.new
+              translation.sql(event)
+              # Schema and explain queries are not reported
+              return unless translation.payload
+
+              formatting = Formatting.new
+              formatting.sql({ name: "active_record.sql", payload: translation.payload })
+
+              logger.debug Events::SQLQuery.new(
+                sql: event.payload[:sql],
+                duration_ms: event.duration,
+                message: formatting.message,
+              )
+            end
+            subscribe_log_level :sql, :debug
+
+            def logger
+              ::ActiveRecord::Base.logger
+            end
           end
 
+          private
           def silence?
             ActiveRecord.silence?
           end

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

@@ -12,7 +12,7 @@ module Logtail
           return true if Logtail::Integrations::Rails::ActiveSupportLogSubscriber.subscribed?(:active_record, LogtailLogSubscriber)
 
           Logtail::Integrations::Rails::ActiveSupportLogSubscriber.unsubscribe!(:active_record, ::ActiveRecord::LogSubscriber)
-          LogtailLogSubscriber.attach_to(:active_record)
+          Logtail::Integrations::Rails::ActiveSupportLogSubscriber.subscribe!(:active_record, LogtailLogSubscriber)
         end
       end
     end

data/lib/logtail-rails/active_support_log_subscriber.rb

@@ -6,6 +6,12 @@ module Logtail
         extend self
 
         def find(component, type)
+          if event_reporter_subscriber?(type)
+            return ::ActiveSupport.event_reporter.subscribers.map { |entry| entry[:subscriber] }.find do |subscriber|
+              subscriber.class == type
+            end
+          end
+
           ::ActiveSupport::LogSubscriber.log_subscribers.find do |subscriber|
             subscriber.class == type
           end
@@ -15,9 +21,25 @@ module Logtail
           !find(component, type).nil?
         end
 
+        def subscribe!(component, type)
+          if event_reporter_subscriber?(type)
+            # Like attach_to below, only deliver the events for the methods the subscriber defines itself
+            events = type.public_instance_methods(false).map { |method| "#{component}.#{method}" }
+            ::ActiveSupport.event_reporter.subscribe(type.new) { |event| events.include?(event[:name]) }
+            return
+          end
+
+          type.attach_to(component)
+        end
+
         # 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 event_reporter_subscriber?(type)
+            ::ActiveSupport.event_reporter.unsubscribe(type)
+            return
+          end
+
           if defined?(type.detach_from)
             type.detach_from(component)
             return
@@ -38,6 +60,12 @@ module Logtail
             end
           end
         end
+
+        # Rails 8.2+ feeds the framework log subscribers from Rails.event instead of
+        # ActiveSupport::Notifications.
+        def event_reporter_subscriber?(type)
+          defined?(::ActiveSupport::EventReporter::LogSubscriber) && type < ::ActiveSupport::EventReporter::LogSubscriber
+        end
       end
     end
   end

data/lib/logtail-rails/event_log_subscriber.rb

@@ -22,6 +22,7 @@ module Logtail
         # Rails 8.1 event emission method - called when events are emitted
         def emit(event)
           return unless self.class.enabled
+          return if framework_event?(event)
 
           # Log the event with all its data to Rails.logger
           # Create a structured log entry with the event data
@@ -42,6 +43,17 @@ module Logtail
 
         private
 
+        # Rails 8.2+ routes the framework's own instrumentation (controller calls, SQL queries,
+        # template renders, ...) through Rails.event as well. The Rails log subscribers, and ours
+        # replacing them, already log those, so only the application's own events are forwarded.
+        def framework_event?(event)
+          return false unless defined?(::ActiveSupport::EventReporter::LogSubscriber)
+
+          ::ActiveSupport::EventReporter::LogSubscriber.descendants.any? do |log_subscriber|
+            event[:name].start_with?("#{log_subscriber.namespace}.")
+          end
+        end
+
         def build_log_message(event)
           payload = event[:payload] || {}
           payload_str = payload.map { |key, value| "#{key}=#{value}" }.join(" ")

data/lib/logtail-rails/version.rb

@@ -1,7 +1,7 @@
 module Logtail
   module Integrations
     module Rails
-      VERSION = "0.2.12"
+      VERSION = "0.2.13"
     end
   end
 end

data/logtail-rails.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", ">= 0.8"
   spec.add_development_dependency "rspec", "~> 3.0"
 
+  spec.add_development_dependency "benchmark", ">= 0"
   spec.add_development_dependency "bundler-audit", ">= 0"
   spec.add_development_dependency "rails_stdout_logging", ">= 0"
   spec.add_development_dependency "rspec-its", ">= 0"
@@ -57,7 +58,10 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency('activerecord-jdbcsqlite3-adapter', '>= 0')
   elsif rails_version >= 3 && rails_version < 6
     spec.add_development_dependency('sqlite3', '1.3.13')
-  else
+  elsif rails_version >= 6 && rails_version < 8
     spec.add_development_dependency('sqlite3', '~> 1.5.0')
+  else
+    # Rails 8 and newer, which is also what rails-edge and the root Gemfile resolve to
+    spec.add_development_dependency('sqlite3', '>= 2.0')
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: logtail-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Better Stack
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logtail
@@ -128,6 +127,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -202,17 +215,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
-description:
+        version: '2.0'
 email:
 - hello@betterstack.com
 executables: []
@@ -220,6 +232,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/main.yml"
+- ".github/workflows/no-closing-keywords.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - Gemfile
@@ -315,6 +329,7 @@ files:
 - gemfiles/rails-7.1.gemfile
 - gemfiles/rails-7.2.gemfile
 - gemfiles/rails-8.0.gemfile
+- gemfiles/rails-8.1.gemfile
 - gemfiles/rails-edge.gemfile
 - lib/logtail-rails.rb
 - lib/logtail-rails/action_controller.rb
@@ -355,7 +370,6 @@ metadata:
   homepage_uri: https://github.com/logtail/logtail-ruby-rails
   source_code_uri: https://github.com/logtail/logtail-ruby-rails
   changelog_uri: https://github.com/logtail/logtail-ruby-rails/blob/main/README.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -370,8 +384,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Better Stack Rails integration
 test_files: []