feat(active_job): support for tracing

.devcontainer/.env.example

@@ -12,5 +12,11 @@ SENTRY_E2E_SVELTE_APP_PORT=4001
 SENTRY_E2E_RAILS_APP_URL="http://localhost:4000"
 SENTRY_E2E_SVELTE_APP_URL="http://localhost:4001"
 
+# ActiveJob queue adapter under test: async | inline | sidekiq | resque | delayed_job
+SENTRY_E2E_ACTIVE_JOB_ADAPTER="async"
+
+# Redis for the sidekiq/resque adapters (the Compose service is named "redis")
+REDIS_URL="redis://redis:6379"
+
 # Faster builds with compose
 COMPOSE_BAKE=true

.devcontainer/docker-compose.yml

@@ -25,6 +25,9 @@ services:
     command: ["mise", "run", "e2e:serve"]
     environment:
       BUNDLE_PATH: /home/sentry/bundle
+    depends_on:
+      redis:
+        condition: service_healthy
     volumes:
       - ..:/workspace/sentry:cached
       - bundle-gems:/home/sentry/bundle
@@ -38,6 +41,11 @@ services:
       - ALLOW_EMPTY_PASSWORD=yes
     ports:
       - "6379:6379"
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 2s
+      timeout: 3s
+      retries: 10
 
 volumes:
   bundle-gems:

.github/workflows/e2e_tests.yml

@@ -17,18 +17,24 @@ concurrency:
 
 jobs:
   e2e-tests:
-    name: e2e tests
+    name: e2e tests (ruby ${{ matrix.ruby.flavor }}, ${{ matrix.adapter }})
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 8
 
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - ruby_version: "3.4.9"
+        ruby:
+          - version: "3.4.9"
             flavor: "3.4"
-          - ruby_version: "4.0.3"
+          - version: "4.0.3"
             flavor: "4.0"
+        adapter:
+          - async
+          - inline
+          - sidekiq
+          - resque
+          - delayed_job
 
     steps:
       - name: Checkout code
@@ -42,9 +48,10 @@ jobs:
         run: |
           cd .devcontainer
           cp .env.example .env
-          echo "RUBY_VERSION=${{ matrix.ruby_version }}" >> .env
-          echo "DOCKER_IMAGE=ghcr.io/getsentry/sentry-ruby-devcontainer-${{ matrix.flavor }}" >> .env
+          echo "RUBY_VERSION=${{ matrix.ruby.version }}" >> .env
+          echo "DOCKER_IMAGE=ghcr.io/getsentry/sentry-ruby-devcontainer-${{ matrix.ruby.flavor }}" >> .env
           echo "DOCKER_TAG=${{ steps.devcontainer-version.outputs.version }}" >> .env
+          echo "SENTRY_E2E_ACTIVE_JOB_ADAPTER=${{ matrix.adapter }}" >> .env
 
       - name: Log in to GHCR
         uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
@@ -54,7 +61,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Pull test container image
-        run: docker pull ghcr.io/getsentry/sentry-ruby-devcontainer-${{ matrix.flavor }}:${{ steps.devcontainer-version.outputs.version }}
+        run: docker pull ghcr.io/getsentry/sentry-ruby-devcontainer-${{ matrix.ruby.flavor }}:${{ steps.devcontainer-version.outputs.version }}
 
       - name: Restore node_modules cache
         uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # v3
@@ -114,7 +121,7 @@ jobs:
         if: failure()
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         with:
-          name: e2e-test-logs-ruby-${{ matrix.ruby_version }}
+          name: e2e-test-logs-ruby-${{ matrix.ruby.version }}-${{ matrix.adapter }}
           path: |
             log/sentry_debug_events.log
           retention-days: 7

.mise.toml

@@ -14,6 +14,10 @@ run = "cd spec/apps/rails-mini && bundle exec ruby app.rb"
 description = "Start the svelte-mini e2e app"
 run = "cd spec/apps/svelte-mini && npm run dev"
 
+[tasks."e2e:worker"]
+description = "Start the rails-mini ActiveJob worker (sidekiq/resque/delayed_job; idles for async/inline)"
+run = "cd spec/apps/rails-mini && bundle exec ruby worker.rb"
+
 [tasks."e2e:serve"]
 description = "Start all e2e apps in parallel"
-depends = ["e2e:rails", "e2e:svelte"]
+depends = ["e2e:rails", "e2e:svelte", "e2e:worker"]

sentry-rails/Gemfile

@@ -56,6 +56,53 @@ end
 
 gem "mini_magick"
 
+# Sidekiq is a dev-only dependency, used by the common ActiveJob spec
+# suite to verify the AJ tracing extension works against the :sidekiq
+# adapter independent of sentry-sidekiq's native middleware.
+#
+# Gated on Ruby/Rails/platform because:
+#   - The sidekiq_adapter_spec only passes on Rails > 7.0.
+#   - Sidekiq 8 requires Ruby >= 3.2; older Rubies fall back to Sidekiq 7.
+#   - Sidekiq does not reliably support JRuby.
+#
+# sidekiq_adapter_spec.rb also rescues LoadError and re-checks the
+# Rails version, so matrices that don't bundle Sidekiq skip the spec
+# cleanly without any other gating.
+unless RUBY_PLATFORM.include?("java")
+  if rails_version > Gem::Version.new("7.0.0") && ruby_version >= Gem::Version.new("3.2")
+    gem "sidekiq", "~> 8.0"
+  elsif rails_version > Gem::Version.new("7.0.0")
+    gem "sidekiq", "~> 7.0"
+  end
+end
+
+# delayed_job and resque are dev-only dependencies, used by the common
+# ActiveJob spec suite to verify the AJ tracing extension works against
+# the :delayed_job and :resque adapters independent of the dedicated
+# sentry-delayed_job / sentry-resque integrations.
+#
+# Both spec files rescue LoadError and skip cleanly on matrices that
+# don't bundle the gem, so the gating below only needs to keep
+# `bundle install` resolvable — it doesn't have to be exact.
+unless RUBY_PLATFORM.include?("java")
+  # delayed_job is backed by ActiveRecord here (delayed_job_active_record),
+  # reusing the dummy app's SQLite database. It supports every Ruby/Rails
+  # combination in the matrix.
+  gem "delayed_job"
+  gem "delayed_job_active_record"
+
+  # resque has no in-memory test mode, so the spec drives it through
+  # mock_redis instead of a live Redis (mirroring how the sidekiq context
+  # uses Sidekiq's fake mode). resque 3 / resque-scheduler 5 / mock_redis
+  # all require Ruby >= 3.0, so gate them on that — older matrices skip
+  # the resque spec via its LoadError rescue.
+  if ruby_version >= Gem::Version.new("3.0")
+    gem "resque"
+    gem "resque-scheduler", "~> 5.0"
+    gem "mock_redis"
+  end
+end
+
 gem "sprockets-rails"
 
 gem "benchmark-ips"