Skip to content

Avoid NPE on QuartzDecorator #10181

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

Merged
amarziali merged 1 commit into from
Dec 12, 2025
Merged

Avoid NPE on QuartzDecorator #10181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 17 additions & 5 deletions ...tation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator;
import org.quartz.JobExecutionContext;
import org.quartz.JobKey;
import org.quartz.TriggerKey;

public class QuartzDecorator extends BaseDecorator {
public static final CharSequence SCHEDULED_CALL = UTF8BytesString.create("scheduled.call");
Expand All @@ -34,11 +36,21 @@ protected CharSequence component() {

public AgentSpan onExecute(final AgentSpan span, JobExecutionContext context) {
if (context != null) {
span.setTag(DDTags.RESOURCE_NAME, context.getJobInstance().getClass()).toString();
span.setTag(QUARTZ_TRIGGER_NAME, context.getTrigger().getKey().getName());
span.setTag(QUARTZ_TRIGGER_GROUP, context.getTrigger().getKey().getGroup());
span.setTag(QUARTZ_JOB_NAME, context.getTrigger().getJobKey().getName());
span.setTag(QUARTZ_JOB_GROUP, context.getTrigger().getJobKey().getGroup());
if (context.getJobInstance() != null) {
span.setTag(DDTags.RESOURCE_NAME, context.getJobInstance().getClass()).toString();
}
if (context.getTrigger() != null) {
final TriggerKey key = context.getTrigger().getKey();
if (key != null) {
span.setTag(QUARTZ_TRIGGER_NAME, key.getName());
span.setTag(QUARTZ_TRIGGER_GROUP, key.getGroup());
}
final JobKey jobKey = context.getJobDetail().getKey();
if (jobKey != null) {
span.setTag(QUARTZ_JOB_NAME, jobKey.getName());
span.setTag(QUARTZ_JOB_GROUP, jobKey.getGroup());
}
}
}
return span;
}
Expand Down
Loading