From cd97069ea6246a0db777bc3269d092d3ca378607 Mon Sep 17 00:00:00 2001 From: Dmitry Aleksandrov Date: Mon, 31 Jul 2023 14:17:43 +0300 Subject: [PATCH] Minor clean up Signed-off-by: Dmitry Aleksandrov --- .../io/helidon/webserver/examples/opentracing/Main.java | 2 +- .../java/io/helidon/tests/integration/webclient/Main.java | 2 +- .../integration/webclient/TracingPropagationTest.java | 2 +- .../helidon/tests/integration/webclient/TracingTest.java | 2 +- .../tests/integration/zipkin/mp22/ZipkinMp22Test.java | 4 ++-- tracing/zipkin/src/main/java/module-info.java | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/webserver/opentracing/src/main/java/io/helidon/webserver/examples/opentracing/Main.java b/examples/webserver/opentracing/src/main/java/io/helidon/webserver/examples/opentracing/Main.java index 38b4b6ec800..a069f0e3353 100644 --- a/examples/webserver/opentracing/src/main/java/io/helidon/webserver/examples/opentracing/Main.java +++ b/examples/webserver/opentracing/src/main/java/io/helidon/webserver/examples/opentracing/Main.java @@ -28,7 +28,7 @@ * The application uses Open Tracing and sends the collected data to ZipKin. * * @see io.helidon.tracing.TracerBuilder - * @see io.helidon.tracing.zipkin.ZipkinTracerBuilder + * @see io.helidon.tracing.providers.zipkin.ZipkinTracerBuilder */ public final class Main { diff --git a/tests/integration/webclient/src/main/java/io/helidon/tests/integration/webclient/Main.java b/tests/integration/webclient/src/main/java/io/helidon/tests/integration/webclient/Main.java index 656142319a7..d1d74ac0722 100644 --- a/tests/integration/webclient/src/main/java/io/helidon/tests/integration/webclient/Main.java +++ b/tests/integration/webclient/src/main/java/io/helidon/tests/integration/webclient/Main.java @@ -23,7 +23,7 @@ import io.helidon.nima.webserver.http.HttpRouting; import io.helidon.nima.webserver.tracing.TracingFeature; import io.helidon.security.integration.nima.SecurityFeature; -import io.helidon.tracing.opentracing.OpenTracing; +import io.helidon.tracing.providers.opentracing.OpenTracing; import io.opentracing.Tracer; diff --git a/tests/integration/webclient/src/test/java/io/helidon/tests/integration/webclient/TracingPropagationTest.java b/tests/integration/webclient/src/test/java/io/helidon/tests/integration/webclient/TracingPropagationTest.java index d3f32726647..6ce3fb12cf1 100644 --- a/tests/integration/webclient/src/test/java/io/helidon/tests/integration/webclient/TracingPropagationTest.java +++ b/tests/integration/webclient/src/test/java/io/helidon/tests/integration/webclient/TracingPropagationTest.java @@ -32,7 +32,7 @@ import io.helidon.nima.webclient.tracing.WebClientTracing; import io.helidon.nima.webserver.WebServerConfig; import io.helidon.tracing.Tracer; -import io.helidon.tracing.opentracing.OpenTracing; +import io.helidon.tracing.providers.opentracing.OpenTracing; import io.opentracing.mock.MockSpan; import io.opentracing.mock.MockTracer; diff --git a/tests/integration/webclient/src/test/java/io/helidon/tests/integration/webclient/TracingTest.java b/tests/integration/webclient/src/test/java/io/helidon/tests/integration/webclient/TracingTest.java index 428a4558f06..ba2ef97877f 100644 --- a/tests/integration/webclient/src/test/java/io/helidon/tests/integration/webclient/TracingTest.java +++ b/tests/integration/webclient/src/test/java/io/helidon/tests/integration/webclient/TracingTest.java @@ -27,7 +27,7 @@ import io.helidon.nima.webclient.tracing.WebClientTracing; import io.helidon.nima.webserver.WebServer; import io.helidon.tracing.Tracer; -import io.helidon.tracing.opentracing.OpenTracing; +import io.helidon.tracing.providers.opentracing.OpenTracing; import io.opentracing.mock.MockSpan; import io.opentracing.mock.MockTracer; diff --git a/tests/integration/zipkin-mp-2.2/src/test/java/io/helidon/tests/integration/zipkin/mp22/ZipkinMp22Test.java b/tests/integration/zipkin-mp-2.2/src/test/java/io/helidon/tests/integration/zipkin/mp22/ZipkinMp22Test.java index 8bc7598b4be..6ba64c55c46 100644 --- a/tests/integration/zipkin-mp-2.2/src/test/java/io/helidon/tests/integration/zipkin/mp22/ZipkinMp22Test.java +++ b/tests/integration/zipkin-mp-2.2/src/test/java/io/helidon/tests/integration/zipkin/mp22/ZipkinMp22Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. + * Copyright (c) 2019, 2023 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,7 +55,7 @@ void testZipkin() { // global tracer wraps the tracer in its own instance ScopeManager scopeManager = GlobalTracer.get().scopeManager(); // and this class is not public - assertThat(scopeManager.getClass().getName(), startsWith("io.helidon.tracing.zipkin")); + assertThat(scopeManager.getClass().getName(), startsWith("io.helidon.tracing.providers.zipkin")); } @Test diff --git a/tracing/zipkin/src/main/java/module-info.java b/tracing/zipkin/src/main/java/module-info.java index c95d7c2542b..22308094c91 100644 --- a/tracing/zipkin/src/main/java/module-info.java +++ b/tracing/zipkin/src/main/java/module-info.java @@ -25,13 +25,13 @@ in = {HelidonFlavor.MP, HelidonFlavor.SE, HelidonFlavor.NIMA}, path = {"Tracing", "Zipkin"} ) -module io.helidon.tracing.zipkin { +module io.helidon.tracing.providers.zipkin { requires static io.helidon.common.features.api; requires io.helidon.common; requires io.helidon.common.config; requires io.helidon.tracing; - requires io.helidon.tracing.opentracing; + requires io.helidon.tracing.providers.opentracing; requires static io.helidon.config.metadata; requires io.opentracing.util; @@ -43,7 +43,7 @@ requires io.opentracing.noop; requires io.opentracing.api; - exports io.helidon.tracing.zipkin; + exports io.helidon.tracing.providers.zipkin; - provides io.helidon.tracing.opentracing.spi.OpenTracingProvider with io.helidon.tracing.zipkin.ZipkinTracerProvider; + provides io.helidon.tracing.providers.opentracing.spi.OpenTracingProvider with io.helidon.tracing.providers.zipkin.ZipkinTracerProvider; }