Skip to content

Commit 2323d00

Browse files
Using correct origin for inference action
1 parent b8e2fce commit 2323d00

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/inference/InferenceRunner.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
import java.util.Set;
2222
import java.util.stream.Collectors;
2323

24+
import static org.elasticsearch.xpack.core.ClientHelper.INFERENCE_ORIGIN;
25+
import static org.elasticsearch.xpack.core.ClientHelper.executeAsyncWithOrigin;
26+
2427
public class InferenceRunner {
2528

2629
private final Client client;
@@ -73,6 +76,12 @@ private static String planInferenceId(InferencePlan<?> plan) {
7376
}
7477

7578
public void doInference(InferenceAction.Request request, ActionListener<InferenceAction.Response> listener) {
76-
client.execute(InferenceAction.INSTANCE, request, listener);
79+
executeAsyncWithOrigin(
80+
client,
81+
INFERENCE_ORIGIN,
82+
InferenceAction.INSTANCE,
83+
request,
84+
listener
85+
);
7786
}
7887
}

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankFeaturePhaseRankCoordinatorContext.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
import java.util.List;
2626
import java.util.Map;
2727

28+
import static org.elasticsearch.xpack.core.ClientHelper.INFERENCE_ORIGIN;
29+
import static org.elasticsearch.xpack.core.ClientHelper.executeAsyncWithOrigin;
30+
2831
/**
2932
* A {@code RankFeaturePhaseRankCoordinatorContext} that performs a rerank inference call to determine relevance scores for documents within
3033
* the provided rank window.
@@ -114,7 +117,7 @@ protected void computeScores(RankFeatureDoc[] featureDocs, ActionListener<float[
114117
List<String> featureData = Arrays.stream(featureDocs).map(x -> x.featureData).toList();
115118
InferenceAction.Request inferenceRequest = generateRequest(featureData);
116119
try {
117-
client.execute(InferenceAction.INSTANCE, inferenceRequest, inferenceListener);
120+
executeAsyncWithOrigin(client, INFERENCE_ORIGIN, InferenceAction.INSTANCE, inferenceRequest, inferenceListener);
118121
} finally {
119122
inferenceRequest.decRef();
120123
}

0 commit comments

Comments
 (0)