Skip to content

Prevent trace context propagation for self-rescheduling operations #130471

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

Closed
wants to merge 1 commit into from
Closed

Prevent trace context propagation for self-rescheduling operations #130471

Show file tree
Hide file tree
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
12 changes: 9 additions & 3 deletions server/src/main/java/org/elasticsearch/health/node/LocalHealthMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ private Monitoring(
* Schedule the first run of the monitor.
*/
public void start() {
scheduledRun = threadPool.schedule(this, TimeValue.ZERO, executor);
scheduleNextRun(TimeValue.ZERO);
}

/**
Expand Down Expand Up @@ -383,8 +383,14 @@ private void scheduleNextRunIfNecessary() {
if (cancelled) {
return;
}
try {
scheduledRun = threadPool.schedule(this, interval, executor);
scheduleNextRun(interval);
}

private void scheduleNextRun(TimeValue delay) {
// Prevent the propagation of the trace context here to not create everlasting APM transactions.
// Such a trace context is created when executing a transport action.
try (var ignored = threadPool.getThreadContext().newEmptySystemContext()) {
scheduledRun = threadPool.schedule(this, delay, executor);
} catch (final EsRejectedExecutionException e) {
logger.debug(() -> format("Scheduled health monitoring was rejected on thread pool [%s]", executor), e);
}
Expand Down
6 changes: 5 additions & 1 deletion x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/DatafeedRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,11 @@ protected void doRun() {
}
holder.problemTracker.finishReport();
if (nextDelayInMsSinceEpoch >= 0) {
doDatafeedRealtime(nextDelayInMsSinceEpoch, jobId, holder);
// Prevent the propagation of the trace context here to not create everlasting APM transactions.
// Such a trace context is created when executing any transport action.
try (var ignored = threadPool.getThreadContext().clearTraceContext()) {
doDatafeedRealtime(nextDelayInMsSinceEpoch, jobId, holder);
}
}
}
}, delay, threadPool.executor(MachineLearning.DATAFEED_THREAD_POOL_NAME));
Expand Down