|
12 | 12 | import org.apache.http.entity.ByteArrayEntity; |
13 | 13 | import org.apache.http.message.BasicHeader; |
14 | 14 | import org.elasticsearch.common.Strings; |
15 | | -import org.elasticsearch.tasks.Task; |
16 | 15 | import org.elasticsearch.xcontent.XContentType; |
17 | 16 | import org.elasticsearch.xpack.inference.common.Truncator; |
18 | 17 | import org.elasticsearch.xpack.inference.external.request.HttpRequest; |
19 | 18 | import org.elasticsearch.xpack.inference.external.request.Request; |
20 | 19 | import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceServiceSparseEmbeddingsModel; |
21 | 20 | import org.elasticsearch.xpack.inference.telemetry.TraceContext; |
| 21 | +import org.elasticsearch.xpack.inference.external.request.TraceContextPropagator; |
22 | 22 |
|
23 | 23 | import java.net.URI; |
24 | 24 | import java.nio.charset.StandardCharsets; |
@@ -56,9 +56,7 @@ public HttpRequest createHttpRequest() { |
56 | 56 | ByteArrayEntity byteEntity = new ByteArrayEntity(requestEntity.getBytes(StandardCharsets.UTF_8)); |
57 | 57 | httpPost.setEntity(byteEntity); |
58 | 58 |
|
59 | | - if (traceContext != null) { |
60 | | - propagateTraceContext(httpPost); |
61 | | - } |
| 59 | + TraceContextPropagator.propagateTraceContext(httpPost, traceContext); |
62 | 60 |
|
63 | 61 | httpPost.setHeader(new BasicHeader(HttpHeaders.CONTENT_TYPE, XContentType.JSON.mediaType())); |
64 | 62 |
|
@@ -90,17 +88,4 @@ public Request truncate() { |
90 | 88 | public boolean[] getTruncationInfo() { |
91 | 89 | return truncationResult.truncated().clone(); |
92 | 90 | } |
93 | | - |
94 | | - private void propagateTraceContext(HttpPost httpPost) { |
95 | | - var traceParent = traceContext.traceParent(); |
96 | | - var traceState = traceContext.traceState(); |
97 | | - |
98 | | - if (traceParent != null) { |
99 | | - httpPost.setHeader(Task.TRACE_PARENT_HTTP_HEADER, traceParent); |
100 | | - } |
101 | | - |
102 | | - if (traceState != null) { |
103 | | - httpPost.setHeader(Task.TRACE_STATE, traceState); |
104 | | - } |
105 | | - } |
106 | 91 | } |
0 commit comments