Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add delayed job context into the sampling context #2148

Merged
merged 4 commits into from
Oct 28, 2023
+18 −1
Merged

add delayed job context into the sampling context #2148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7101fcd
copy delayed job context into the transaction via custom_sampling_con…
rlineweaver Oct 19, 2023
a615492
add changelog entry
rlineweaver Oct 19, 2023
6f87753
add spec
rlineweaver Oct 19, 2023
9da2d74
Merge branch 'master' into copy-delayed-job-context-into-transaction
rlineweaver Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

### Features

- Make additional job context available to traces_sampler for determining sample rate (sentry-delayed_job) [#2148](https://github.com/getsentry/sentry-ruby/pull/2148)
- Add new `config.rails.active_support_logger_subscription_items` to allow customization breadcrumb data of active support logger [#2139](https://github.com/getsentry/sentry-ruby/pull/2139)

```rb
Expand Down
7 changes: 6 additions & 1 deletion sentry-delayed_job/lib/sentry/delayed_job/plugin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ class Plugin < ::Delayed::Plugin
scope.set_contexts(**contexts)
scope.set_tags("delayed_job.queue" => job.queue, "delayed_job.id" => job.id.to_s)

transaction = Sentry.start_transaction(name: scope.transaction_name, source: scope.transaction_source, op: OP_NAME)
transaction = Sentry.start_transaction(
name: scope.transaction_name,
source: scope.transaction_source,
op: OP_NAME,
custom_sampling_context: contexts
)
scope.set_span(transaction) if transaction

begin
Expand Down
11 changes: 11 additions & 0 deletions sentry-delayed_job/spec/sentry/delayed_job_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,17 @@ def perform
expect(transaction.contexts.dig(:trace, :status)).to eq("ok")
end

it "passes job context into the sampling context" do
expect_any_instance_of(Sentry::Transaction).to receive(:set_initial_sample_decision) do |**args|
expect(args.dig(:sampling_context, Sentry::DelayedJob::Plugin::DELAYED_JOB_CONTEXT_KEY, :priority)).to eq(7)
expect(args.dig(:sampling_context, Sentry::DelayedJob::Plugin::ACTIVE_JOB_CONTEXT_KEY, :job_class)).to eq('ReportingJob')
end
ReportingJob.set(priority: 7).perform_later

enqueued_job = Delayed::Backend::ActiveRecord::Job.last
enqueued_job.invoke_job
end

it "records transaction with exception" do
FailedJob.perform_later
enqueued_job = Delayed::Backend::ActiveRecord::Job.last
Expand Down