From 666c7be07d215d825bc18878487da477930d7fc1 Mon Sep 17 00:00:00 2001
From: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
Date: Mon, 31 Jul 2023 17:25:28 +0300
Subject: [PATCH] Applied comments

Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
---
 tracing/providers/jaeger/pom.xml              |  2 +-
 tracing/providers/opentelemetry/pom.xml       |  2 +-
 .../OpenTelemetryTracerProvider.java          |  2 +-
 .../providers/opentelemetry/package-info.java |  2 +-
 .../opentracing/etc/spotbugs/exclude.xml      |  2 +-
 tracing/providers/opentracing/pom.xml         |  2 +-
 .../providers/opentracing/OpenTracing.java    |  2 +-
 .../OpenTracingTracerProvider.java            |  2 +-
 .../src/main/java/module-info.java            |  9 ++--
 tracing/providers/zipkin/pom.xml              |  2 +-
 .../providers/zipkin/ZipkinTracer.java        |  5 +-
 .../zipkin/src/main/java/module-info.java     | 10 ++++
 tracing/zipkin/src/main/java/module-info.java | 49 -------------------
 13 files changed, 24 insertions(+), 67 deletions(-)
 delete mode 100644 tracing/zipkin/src/main/java/module-info.java

diff --git a/tracing/providers/jaeger/pom.xml b/tracing/providers/jaeger/pom.xml
index 43c361a3eaf..224afbff95a 100644
--- a/tracing/providers/jaeger/pom.xml
+++ b/tracing/providers/jaeger/pom.xml
@@ -26,7 +26,7 @@
     </parent>
 
     <artifactId>helidon-tracing-providers-jaeger</artifactId>
-    <name>Helidon Tracing Jaeger</name>
+    <name>Helidon Tracing Providers Jaeger</name>
 
     <description>
         Integration with Jaeger tracing
diff --git a/tracing/providers/opentelemetry/pom.xml b/tracing/providers/opentelemetry/pom.xml
index 7d14d56acb7..66c645892d4 100644
--- a/tracing/providers/opentelemetry/pom.xml
+++ b/tracing/providers/opentelemetry/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>helidon-tracing-providers-opentelemetry</artifactId>
-    <name>Helidon Tracing Open Telemetry</name>
+    <name>Helidon Tracing Providers Open Telemetry</name>
 
     <dependencies>
         <dependency>
diff --git a/tracing/providers/opentelemetry/src/main/java/io/helidon/tracing/providers/opentelemetry/OpenTelemetryTracerProvider.java b/tracing/providers/opentelemetry/src/main/java/io/helidon/tracing/providers/opentelemetry/OpenTelemetryTracerProvider.java
index 038456fd792..6ec1f30a272 100644
--- a/tracing/providers/opentelemetry/src/main/java/io/helidon/tracing/providers/opentelemetry/OpenTelemetryTracerProvider.java
+++ b/tracing/providers/opentelemetry/src/main/java/io/helidon/tracing/providers/opentelemetry/OpenTelemetryTracerProvider.java
@@ -34,7 +34,7 @@
 import io.opentelemetry.api.OpenTelemetry;
 
 /**
- * Service loader provider implementation for {@link TracerProvider}.
+ * Service loader provider implementation for {@link io.helidon.tracing.spi.TracerProvider}.
  */
 @Weight(Weighted.DEFAULT_WEIGHT - 50)
 public class OpenTelemetryTracerProvider implements TracerProvider {
diff --git a/tracing/providers/opentelemetry/src/main/java/io/helidon/tracing/providers/opentelemetry/package-info.java b/tracing/providers/opentelemetry/src/main/java/io/helidon/tracing/providers/opentelemetry/package-info.java
index b0cae627c0b..a81f11ef3b5 100644
--- a/tracing/providers/opentelemetry/src/main/java/io/helidon/tracing/providers/opentelemetry/package-info.java
+++ b/tracing/providers/opentelemetry/src/main/java/io/helidon/tracing/providers/opentelemetry/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 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.
diff --git a/tracing/providers/opentracing/etc/spotbugs/exclude.xml b/tracing/providers/opentracing/etc/spotbugs/exclude.xml
index e32a317e920..fc916387c64 100644
--- a/tracing/providers/opentracing/etc/spotbugs/exclude.xml
+++ b/tracing/providers/opentracing/etc/spotbugs/exclude.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2023 Oracle and/or its affiliates.
+    Copyright (c) 2022, 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.
diff --git a/tracing/providers/opentracing/pom.xml b/tracing/providers/opentracing/pom.xml
index a1f84bb4c50..d6107e6babd 100644
--- a/tracing/providers/opentracing/pom.xml
+++ b/tracing/providers/opentracing/pom.xml
@@ -25,7 +25,7 @@
     </parent>
 
     <artifactId>helidon-tracing-providers-opentracing</artifactId>
-    <name>Helidon Tracing Open Tracing</name>
+    <name>Helidon Tracing Providers Open Tracing</name>
     <description>As OpenTracing is now discontinued, this is a backward compatibility module to support it.
     Please switch to Open Telemetry</description>
 
diff --git a/tracing/providers/opentracing/src/main/java/io/helidon/tracing/providers/opentracing/OpenTracing.java b/tracing/providers/opentracing/src/main/java/io/helidon/tracing/providers/opentracing/OpenTracing.java
index c5b918979be..1f2f4e801e2 100644
--- a/tracing/providers/opentracing/src/main/java/io/helidon/tracing/providers/opentracing/OpenTracing.java
+++ b/tracing/providers/opentracing/src/main/java/io/helidon/tracing/providers/opentracing/OpenTracing.java
@@ -41,7 +41,7 @@ public static io.helidon.tracing.Tracer create(Tracer tracer) {
      *
      * @param tracer the tracer that created the span
      * @param span open telemetry span
-     * @return Helidon {@link Span}
+     * @return Helidon {@link io.helidon.tracing.Span}
      */
     public static Span create(Tracer tracer, io.opentracing.Span span) {
         return new OpenTracingSpan(tracer, span);
diff --git a/tracing/providers/opentracing/src/main/java/io/helidon/tracing/providers/opentracing/OpenTracingTracerProvider.java b/tracing/providers/opentracing/src/main/java/io/helidon/tracing/providers/opentracing/OpenTracingTracerProvider.java
index 557ac152db3..39d9b6fa279 100644
--- a/tracing/providers/opentracing/src/main/java/io/helidon/tracing/providers/opentracing/OpenTracingTracerProvider.java
+++ b/tracing/providers/opentracing/src/main/java/io/helidon/tracing/providers/opentracing/OpenTracingTracerProvider.java
@@ -28,7 +28,7 @@
 import io.opentracing.util.GlobalTracer;
 
 /**
- * {@link java.util.ServiceLoader} service implementation of {@link TracerProvider} for Open Tracing
+ * {@link java.util.ServiceLoader} service implementation of {@link io.helidon.tracing.spi.TracerProvider} for Open Tracing
  * tracers.
  */
 @Weight(Weighted.DEFAULT_WEIGHT - 50) // low weight, so it is easy to override
diff --git a/tracing/providers/opentracing/src/main/java/module-info.java b/tracing/providers/opentracing/src/main/java/module-info.java
index e21707ad825..cfbd8e33300 100644
--- a/tracing/providers/opentracing/src/main/java/module-info.java
+++ b/tracing/providers/opentracing/src/main/java/module-info.java
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-import io.helidon.tracing.providers.opentracing.OpenTracingTracerProvider;
-import io.helidon.tracing.providers.opentracing.spi.OpenTracingProvider;
-import io.helidon.tracing.spi.TracerProvider;
-
 /**
  * Open tracing support for Helidon tracing.
  */
@@ -33,6 +29,7 @@
     requires io.opentracing.api;
     requires io.opentracing.noop;
 
-    uses OpenTracingProvider;
-    provides TracerProvider with OpenTracingTracerProvider;
+    uses io.helidon.tracing.providers.opentracing.spi.OpenTracingProvider;
+    provides io.helidon.tracing.spi.TracerProvider
+            with io.helidon.tracing.providers.opentracing.OpenTracingTracerProvider;
 }
\ No newline at end of file
diff --git a/tracing/providers/zipkin/pom.xml b/tracing/providers/zipkin/pom.xml
index 0817dc020e5..cb1164944d9 100644
--- a/tracing/providers/zipkin/pom.xml
+++ b/tracing/providers/zipkin/pom.xml
@@ -26,7 +26,7 @@
     </parent>
 
     <artifactId>helidon-tracing-providers-zipkin</artifactId>
-    <name>Helidon Tracing Zipkin</name>
+    <name>Helidon Tracing Providers Zipkin</name>
 
     <description>
         Support for Zipkin distributed tracing system.
diff --git a/tracing/providers/zipkin/src/main/java/io/helidon/tracing/providers/zipkin/ZipkinTracer.java b/tracing/providers/zipkin/src/main/java/io/helidon/tracing/providers/zipkin/ZipkinTracer.java
index dcd3a706c07..93b735a622f 100644
--- a/tracing/providers/zipkin/src/main/java/io/helidon/tracing/providers/zipkin/ZipkinTracer.java
+++ b/tracing/providers/zipkin/src/main/java/io/helidon/tracing/providers/zipkin/ZipkinTracer.java
@@ -19,7 +19,6 @@
 import java.util.List;
 
 import io.helidon.tracing.Tag;
-import io.helidon.tracing.TracerBuilder;
 
 import brave.opentracing.BraveTracer;
 import io.opentracing.Scope;
@@ -30,10 +29,10 @@
 import io.opentracing.propagation.Format;
 
 /**
- * The ZipkinTracer delegates to {@link BraveTracer} while creating {@link ZipkinSpanBuilder}
+ * The ZipkinTracer delegates to {@link brave.opentracing.BraveTracer} while creating {@link ZipkinSpanBuilder}
  * instead of {@link brave.opentracing.BraveSpanBuilder}.
  * This class should not be sued directly, use either
- * {@link TracerBuilder} or {@link ZipkinTracerBuilder}.
+ * {@link io.helidon.tracing.TracerBuilder} or {@link ZipkinTracerBuilder}.
  *
  * @see <a href="http://zipkin.io/pages/instrumenting.html#core-data-structures">Zipkin Attributes</a>
  * @see <a href="https://github.com/openzipkin/zipkin/issues/962">Zipkin Missing Service Name</a>
diff --git a/tracing/providers/zipkin/src/main/java/module-info.java b/tracing/providers/zipkin/src/main/java/module-info.java
index 3b2273bb2f6..bb6ae9e25b1 100644
--- a/tracing/providers/zipkin/src/main/java/module-info.java
+++ b/tracing/providers/zipkin/src/main/java/module-info.java
@@ -14,10 +14,20 @@
  * limitations under the License.
  */
 
+import io.helidon.common.features.api.Feature;
+import io.helidon.common.features.api.HelidonFlavor;
+
 /**
  * Zipkin tracing support.
  */
+@Feature(value = "Zipkin",
+        description = "Zipkin tracer integration",
+        in = {HelidonFlavor.MP, HelidonFlavor.SE, HelidonFlavor.NIMA},
+        path = {"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;
diff --git a/tracing/zipkin/src/main/java/module-info.java b/tracing/zipkin/src/main/java/module-info.java
deleted file mode 100644
index 22308094c91..00000000000
--- a/tracing/zipkin/src/main/java/module-info.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2018, 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import io.helidon.common.features.api.Feature;
-import io.helidon.common.features.api.HelidonFlavor;
-
-/**
- * Zipkin tracing support.
- */
-@Feature(value = "Zipkin",
-        description = "Zipkin tracer integration",
-        in = {HelidonFlavor.MP, HelidonFlavor.SE, HelidonFlavor.NIMA},
-        path = {"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.providers.opentracing;
-    requires static io.helidon.config.metadata;
-
-    requires io.opentracing.util;
-    requires brave.opentracing;
-    requires zipkin2.reporter;
-    requires zipkin2.reporter.urlconnection;
-    requires zipkin2;
-    requires brave;
-    requires io.opentracing.noop;
-    requires io.opentracing.api;
-
-    exports io.helidon.tracing.providers.zipkin;
-
-    provides io.helidon.tracing.providers.opentracing.spi.OpenTracingProvider with io.helidon.tracing.providers.zipkin.ZipkinTracerProvider;
-}