Skip to content

Commit 84e0d37

Browse files
authored
Move Opentracing to Helidon Tracing API (helidon-io#7678)
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
1 parent 6c56b9d commit 84e0d37

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

integrations/common/rest/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
<artifactId>helidon-http-media-jsonp</artifactId>
5353
</dependency>
5454
<dependency>
55-
<groupId>io.opentracing</groupId>
56-
<artifactId>opentracing-api</artifactId>
55+
<groupId>io.helidon.tracing</groupId>
56+
<artifactId>helidon-tracing</artifactId>
5757
</dependency>
5858
<dependency>
5959
<groupId>io.helidon.webserver.testing.junit5</groupId>

integrations/common/rest/src/main/java/io/helidon/integrations/common/rest/RestApiBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
import io.helidon.http.Method;
3636
import io.helidon.http.Status;
3737
import io.helidon.integrations.common.rest.ApiOptionalResponse.BuilderBase;
38+
import io.helidon.tracing.SpanContext;
3839
import io.helidon.webclient.api.HttpClientRequest;
3940
import io.helidon.webclient.api.HttpClientResponse;
4041
import io.helidon.webclient.api.WebClient;
4142

42-
import io.opentracing.SpanContext;
4343
import jakarta.json.JsonBuilderFactory;
4444
import jakarta.json.JsonObject;
4545
import jakarta.json.JsonReaderFactory;
@@ -903,7 +903,7 @@ protected String requestId(ApiRequest<?> request) {
903903
return request.requestId()
904904
.or(() -> Contexts.context()
905905
.flatMap(it -> it.get(SpanContext.class))
906-
.map(SpanContext::toTraceId))
906+
.map(SpanContext::traceId))
907907
.orElseGet(UUID.randomUUID()::toString);
908908
}
909909

integrations/common/rest/src/main/java/module-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
requires io.helidon.config;
3030
requires io.helidon.faulttolerance;
3131
requires io.helidon.http.media.jsonp;
32+
requires io.helidon.tracing;
3233
requires io.helidon.webclient;
33-
requires io.opentracing.api;
3434
requires java.logging;
3535

3636
requires transitive io.helidon.common;

0 commit comments

Comments
 (0)