Skip to content

Commit

Permalink
Applied comments
Browse files Browse the repository at this point in the history
Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
  • Loading branch information
dalexandrov committed Jul 31, 2023
1 parent cd97069 commit 666c7be
Show file tree
Hide file tree
Showing 13 changed files with 24 additions and 67 deletions.
2 changes: 1 addition & 1 deletion tracing/providers/jaeger/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tracing/providers/opentelemetry/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tracing/providers/opentracing/etc/spotbugs/exclude.xml
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion tracing/providers/opentracing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions tracing/providers/opentracing/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand All @@ -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;
}
2 changes: 1 addition & 1 deletion tracing/providers/zipkin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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>
Expand Down
10 changes: 10 additions & 0 deletions tracing/providers/zipkin/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
49 changes: 0 additions & 49 deletions tracing/zipkin/src/main/java/module-info.java

This file was deleted.

0 comments on commit 666c7be

Please sign in to comment.