diff --git a/.github/workflows/sentry_delayed_job_test.yml b/.github/workflows/sentry_delayed_job_test.yml index d14c1158a..c9bce4f7c 100644 --- a/.github/workflows/sentry_delayed_job_test.yml +++ b/.github/workflows/sentry_delayed_job_test.yml @@ -28,6 +28,7 @@ jobs: RUBYOPT: ${{ matrix.options.rubyopt }} BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-delayed_job/Gemfile BUNDLE_WITHOUT: rubocop + JRUBY_OPTS: "--debug" # for more accurate test coverage strategy: fail-fast: false matrix: diff --git a/.github/workflows/sentry_opentelemetry_test.yml b/.github/workflows/sentry_opentelemetry_test.yml index 51d81a715..bb374faed 100644 --- a/.github/workflows/sentry_opentelemetry_test.yml +++ b/.github/workflows/sentry_opentelemetry_test.yml @@ -29,6 +29,7 @@ jobs: BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-opentelemetry/Gemfile BUNDLE_WITHOUT: rubocop OPENTELEMETRY_VERSION: ${{ matrix.opentelemetry_version }} + JRUBY_OPTS: "--debug" # for more accurate test coverage strategy: fail-fast: false matrix: diff --git a/.github/workflows/sentry_rails_test.yml b/.github/workflows/sentry_rails_test.yml index 5f9d80c58..c7210a5df 100644 --- a/.github/workflows/sentry_rails_test.yml +++ b/.github/workflows/sentry_rails_test.yml @@ -25,6 +25,7 @@ jobs: BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-rails/Gemfile BUNDLE_WITHOUT: rubocop RAILS_VERSION: ${{ matrix.rails_version }} + JRUBY_OPTS: "--debug" # for more accurate test coverage strategy: fail-fast: false matrix: @@ -61,7 +62,6 @@ jobs: rails_version: 7.1.0 exclude: - ruby_version: head - - ruby_version: 'jruby' - ruby_version: jruby-head - ruby_version: "3.4" rails_version: "6.1.0" diff --git a/.github/workflows/sentry_resque_test.yml b/.github/workflows/sentry_resque_test.yml index 1507d19c8..ac5f72eef 100644 --- a/.github/workflows/sentry_resque_test.yml +++ b/.github/workflows/sentry_resque_test.yml @@ -28,6 +28,7 @@ jobs: RUBYOPT: ${{ matrix.options.rubyopt }} BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-resque/Gemfile BUNDLE_WITHOUT: rubocop + JRUBY_OPTS: "--debug" # for more accurate test coverage strategy: fail-fast: false matrix: diff --git a/.github/workflows/sentry_ruby_test.yml b/.github/workflows/sentry_ruby_test.yml index 05545ba08..9f7bc6a32 100644 --- a/.github/workflows/sentry_ruby_test.yml +++ b/.github/workflows/sentry_ruby_test.yml @@ -26,6 +26,7 @@ jobs: BUNDLE_WITHOUT: rubocop RACK_VERSION: ${{ matrix.rack_version }} REDIS_RB_VERSION: ${{ matrix.redis_rb_version }} + JRUBY_OPTS: "--debug" # for more accurate test coverage strategy: fail-fast: false matrix: diff --git a/.github/workflows/sentry_sidekiq_test.yml b/.github/workflows/sentry_sidekiq_test.yml index 322acbee8..692007f49 100644 --- a/.github/workflows/sentry_sidekiq_test.yml +++ b/.github/workflows/sentry_sidekiq_test.yml @@ -29,17 +29,18 @@ jobs: BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-sidekiq/Gemfile BUNDLE_WITHOUT: rubocop SIDEKIQ_VERSION: ${{ matrix.sidekiq_version }} + JRUBY_OPTS: "--debug" # for more accurate test coverage strategy: fail-fast: false matrix: ruby_version: ${{ fromJson(inputs.versions) }} sidekiq_version: ["5.0", "6.5", "7.0"] include: - - ruby_version: jruby-9.4.12.0 + - ruby_version: jruby-9.4.14.0 sidekiq_version: 5.0 - - ruby_version: jruby-9.4.12.0 + - ruby_version: jruby-9.4.14.0 sidekiq_version: 6.0 - - ruby_version: jruby-9.4.12.0 + - ruby_version: jruby-9.4.14.0 sidekiq_version: 7.0 - ruby_version: "3.2" sidekiq_version: 7.0 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 74c5ba764..9125af6a0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,7 @@ jobs: with: engine: cruby-jruby min_version: 2.7 - versions: '["jruby-9.4.12.0"]' + versions: '["jruby-9.4.14.0"]' secrets: inherit delayed_job-tests: diff --git a/sentry-rails/spec/sentry/rails/activejob_spec.rb b/sentry-rails/spec/sentry/rails/activejob_spec.rb index 05c491858..a2b637541 100644 --- a/sentry-rails/spec/sentry/rails/activejob_spec.rb +++ b/sentry-rails/spec/sentry/rails/activejob_spec.rb @@ -352,7 +352,7 @@ def perform describe "Reporting on retry errors", skip: RAILS_VERSION < 7.0 do before do - if defined?(JRUBY_VERSION) && JRUBY_VERSION == "9.4.12.0" + if defined?(JRUBY_VERSION) && JRUBY_VERSION == "9.4.14.0" skip "This crashes on jruby + rails 7.0.0.x. See https://github.com/getsentry/sentry-ruby/issues/2612" end diff --git a/sentry-rails/spec/sentry/rails/tracing/active_record_subscriber_spec.rb b/sentry-rails/spec/sentry/rails/tracing/active_record_subscriber_spec.rb index 015fa9f54..45b80d321 100644 --- a/sentry-rails/spec/sentry/rails/tracing/active_record_subscriber_spec.rb +++ b/sentry-rails/spec/sentry/rails/tracing/active_record_subscriber_spec.rb @@ -95,7 +95,11 @@ def foo data = span[:data] expect(data["code.filepath"]).to eq(__FILE__) expect(data["code.lineno"]).to eq(query_line) - expect(data["code.namespace"]).to eq(rspec_class) if RUBY_VERSION.to_f >= 3.4 + + if RUBY_VERSION.to_f >= 3.4 && RUBY_ENGINE == "ruby" + expect(data["code.namespace"]).to eq(rspec_class) + end + expect(data["code.function"]).to eq("foo") end end