From 951a1d3efc8f12252d8e70868c7fa5d9dff1804e Mon Sep 17 00:00:00 2001 From: Peter Solnica Date: Wed, 21 May 2025 09:15:40 +0000 Subject: [PATCH 1/2] fix(tests): Increase latency tolerance in SentryContextServerMiddleware spec --- .../spec/sentry/sidekiq/sentry_context_middleware_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry-sidekiq/spec/sentry/sidekiq/sentry_context_middleware_spec.rb b/sentry-sidekiq/spec/sentry/sidekiq/sentry_context_middleware_spec.rb index 39dcd09c1..d4dd049a1 100644 --- a/sentry-sidekiq/spec/sentry/sidekiq/sentry_context_middleware_spec.rb +++ b/sentry-sidekiq/spec/sentry/sidekiq/sentry_context_middleware_spec.rb @@ -90,7 +90,7 @@ def timecop_delay expect(trace[:data]['messaging.message.id']).to eq('123456') expect(trace[:data]['messaging.destination.name']).to eq('default') expect(trace[:data]['messaging.message.retry.count']).to eq(0) - expect(trace[:data]['messaging.message.receive.latency']).to be_within(1).of(expected_latency) + expect(trace[:data]['messaging.message.receive.latency']).to be_within(3).of(expected_latency) end if MIN_SIDEKIQ_6 From d8bbb2c960234039fdf0857e22e0d5c5eeb84a1a Mon Sep 17 00:00:00 2001 From: Peter Solnica Date: Wed, 21 May 2025 09:39:00 +0000 Subject: [PATCH 2/2] chore(workflows): Set timeout for all test workflows to 10 minutes --- .github/workflows/sentry_delayed_job_test.yml | 1 + .github/workflows/sentry_opentelemetry_test.yml | 1 + .github/workflows/sentry_rails_test.yml | 1 + .github/workflows/sentry_resque_test.yml | 1 + .github/workflows/sentry_sidekiq_test.yml | 1 + 5 files changed, 5 insertions(+) diff --git a/.github/workflows/sentry_delayed_job_test.yml b/.github/workflows/sentry_delayed_job_test.yml index 21c9cdce9..d14c1158a 100644 --- a/.github/workflows/sentry_delayed_job_test.yml +++ b/.github/workflows/sentry_delayed_job_test.yml @@ -23,6 +23,7 @@ jobs: working-directory: sentry-delayed_job name: Ruby ${{ matrix.ruby_version }}, options - ${{ toJson(matrix.options) }} runs-on: ubuntu-latest + timeout-minutes: 10 env: RUBYOPT: ${{ matrix.options.rubyopt }} BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-delayed_job/Gemfile diff --git a/.github/workflows/sentry_opentelemetry_test.yml b/.github/workflows/sentry_opentelemetry_test.yml index f7dea70d4..51d81a715 100644 --- a/.github/workflows/sentry_opentelemetry_test.yml +++ b/.github/workflows/sentry_opentelemetry_test.yml @@ -23,6 +23,7 @@ jobs: working-directory: sentry-opentelemetry name: Ruby ${{ matrix.ruby_version }} & OpenTelemetry ${{ matrix.opentelemetry_version }}, options - ${{ toJson(matrix.options) }} runs-on: ubuntu-latest + timeout-minutes: 10 env: RUBYOPT: ${{ matrix.options.rubyopt }} BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-opentelemetry/Gemfile diff --git a/.github/workflows/sentry_rails_test.yml b/.github/workflows/sentry_rails_test.yml index 71375e8f1..306cef080 100644 --- a/.github/workflows/sentry_rails_test.yml +++ b/.github/workflows/sentry_rails_test.yml @@ -19,6 +19,7 @@ jobs: working-directory: sentry-rails name: Ruby ${{ matrix.ruby_version }} & Rails ${{ matrix.rails_version }}, options - ${{ toJson(matrix.options) }} runs-on: ubuntu-latest + timeout-minutes: 10 env: RUBYOPT: ${{ matrix.options.rubyopt }} BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-rails/Gemfile diff --git a/.github/workflows/sentry_resque_test.yml b/.github/workflows/sentry_resque_test.yml index 8d4b5904e..1507d19c8 100644 --- a/.github/workflows/sentry_resque_test.yml +++ b/.github/workflows/sentry_resque_test.yml @@ -23,6 +23,7 @@ jobs: working-directory: sentry-resque name: Ruby ${{ matrix.ruby_version }}, options - ${{ toJson(matrix.options) }} runs-on: ubuntu-latest + timeout-minutes: 10 env: RUBYOPT: ${{ matrix.options.rubyopt }} BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-resque/Gemfile diff --git a/.github/workflows/sentry_sidekiq_test.yml b/.github/workflows/sentry_sidekiq_test.yml index 0669d1293..34904339c 100644 --- a/.github/workflows/sentry_sidekiq_test.yml +++ b/.github/workflows/sentry_sidekiq_test.yml @@ -23,6 +23,7 @@ jobs: working-directory: sentry-sidekiq name: Ruby ${{ matrix.ruby_version }} & Sidekiq ${{ matrix.sidekiq_version }}, options - ${{ toJson(matrix.options) }} runs-on: ubuntu-latest + timeout-minutes: 10 env: RUBYOPT: ${{ matrix.options.rubyopt }} BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-sidekiq/Gemfile