Skip to content

Commit 7b359a9

Browse files
authored
Do not report empty parent task id in trace attributes. (#131002)
Do not report empty parent task id in trace attributes. Relates to ES-10969
1 parent e2ec28d commit 7b359a9

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

server/src/main/java/org/elasticsearch/tasks/TaskManager.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,9 @@ public Task register(String type, String action, TaskAwareRequest request, boole
179179
// package private for testing
180180
void startTrace(ThreadContext threadContext, Task task) {
181181
TaskId parentTask = task.getParentTaskId();
182-
Map<String, Object> attributes = Map.of(
183-
Tracer.AttributeKeys.TASK_ID,
184-
task.getId(),
185-
Tracer.AttributeKeys.PARENT_TASK_ID,
186-
parentTask.toString()
187-
);
182+
Map<String, Object> attributes = parentTask.isSet()
183+
? Map.of(Tracer.AttributeKeys.TASK_ID, task.getId(), Tracer.AttributeKeys.PARENT_TASK_ID, parentTask.toString())
184+
: Map.of(Tracer.AttributeKeys.TASK_ID, task.getId());
188185
tracer.startTrace(threadContext, task, task.getAction(), attributes);
189186
}
190187

server/src/test/java/org/elasticsearch/tasks/TaskManagerTests.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,9 @@ public void testRegisterTaskStartsTracing() {
285285
final Tracer mockTracer = mock(Tracer.class);
286286
final TaskManager taskManager = new TaskManager(Settings.EMPTY, threadPool, Set.of(), mockTracer);
287287

288+
final boolean hasParentTask = randomBoolean();
289+
final TaskId parentTask = hasParentTask ? new TaskId("parentNode", 1) : TaskId.EMPTY_TASK_ID;
290+
288291
final Task task = taskManager.register("testType", "testAction", new TaskAwareRequest() {
289292

290293
@Override
@@ -295,11 +298,14 @@ public void setRequestId(long requestId) {}
295298

296299
@Override
297300
public TaskId getParentTask() {
298-
return TaskId.EMPTY_TASK_ID;
301+
return parentTask;
299302
}
300303
});
301304

302-
verify(mockTracer).startTrace(any(), eq(task), eq("testAction"), anyMap());
305+
Map<String, Object> attributes = hasParentTask
306+
? Map.of(Tracer.AttributeKeys.TASK_ID, task.getId(), Tracer.AttributeKeys.PARENT_TASK_ID, parentTask.toString())
307+
: Map.of(Tracer.AttributeKeys.TASK_ID, task.getId());
308+
verify(mockTracer).startTrace(any(), eq(task), eq("testAction"), eq(attributes));
303309
}
304310

305311
/**

0 commit comments

Comments
 (0)