diff --git a/docs/changelog/132945.yaml b/docs/changelog/132945.yaml new file mode 100644 index 0000000000000..a7ba515a02725 --- /dev/null +++ b/docs/changelog/132945.yaml @@ -0,0 +1,5 @@ +pr: 132945 +summary: Disable child span for streaming tasks +area: Machine Learning +type: bug +issues: [] diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/task/StreamingTaskManager.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/task/StreamingTaskManager.java index 8aa437c773608..3ddb9883ba007 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/task/StreamingTaskManager.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/action/task/StreamingTaskManager.java @@ -105,7 +105,7 @@ public Task createTask(long id, String type, String action, TaskId parentTaskId, flowTask.addListener(TaskBackedProcessor.this::cancelTask); return flowTask; } - }); + }, false); } } } diff --git a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/task/StreamingTaskManagerTests.java b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/task/StreamingTaskManagerTests.java index 8ca4a5f2aa309..ba070c2caa56b 100644 --- a/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/task/StreamingTaskManagerTests.java +++ b/x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/action/task/StreamingTaskManagerTests.java @@ -54,7 +54,7 @@ public void setUp() throws Exception { doAnswer(ans -> { TaskAwareRequest taskAwareRequest = ans.getArgument(2); return taskAwareRequest.createTask(1L, taskType, taskAction, TaskId.EMPTY_TASK_ID, Map.of()); - }).when(taskManager).register(any(), any(), any()); + }).when(taskManager).register(any(), any(), any(), eq(false)); } @After @@ -67,7 +67,7 @@ public void testSubscribeRegistersTask() { processor.subscribe(mock()); - verify(taskManager, only()).register(eq(taskType), eq(taskAction), any()); + verify(taskManager, only()).register(eq(taskType), eq(taskAction), any(), eq(false)); } public void testCancelPropagatesUpstreamAndDownstream() { @@ -77,7 +77,7 @@ public void testCancelPropagatesUpstreamAndDownstream() { var registeredTask = (CancellableTask) taskAwareRequest.createTask(1L, taskType, taskAction, TaskId.EMPTY_TASK_ID, Map.of()); task.set(registeredTask); return registeredTask; - }).when(taskManager).register(any(), any(), any()); + }).when(taskManager).register(any(), any(), any(), eq(false)); Flow.Subscriber downstream = mock(); Flow.Subscription upstream = mock(); @@ -173,7 +173,7 @@ public void testOnNextAfterCancelDoesNotForwardItem() { var registeredTask = (CancellableTask) taskAwareRequest.createTask(1L, taskType, taskAction, TaskId.EMPTY_TASK_ID, Map.of()); task.set(registeredTask); return registeredTask; - }).when(taskManager).register(any(), any(), any()); + }).when(taskManager).register(any(), any(), any(), eq(false)); var processor = streamingTaskManager.create(taskType, taskAction); var downstream = establishFlow(processor);