Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.x] - Refactor to Tracing providers #7264

Merged
merged 7 commits into from
Aug 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions THIRD_PARTY_LICENSES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ of Helidon. They are identified by the Helidon module(s) that use them.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
Brave OpenTracing Java Bridge for Zipkin The OpenZipkin Authors
Apache 2.0
Used by: [helidon-tracing-zipkin]
Used by: [helidon-tracing-providers-zipkin]
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
Zipkin OpenTracing Brave (io.opentracing.brave:brave-opentracing)
Copyright 2016-2020 The OpenZipkin Authors
Expand Down Expand Up @@ -2730,7 +2730,7 @@ Fourth Party Runtime Dependencies
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
OpenTracing API for Java Opentracing.Io
Apache 2.0
Used by: [helidon-integrations-common-rest, helidon-reactive-dbclient-tracing, helidon-security-integration-jersey, helidon-tracing-opentracing, helidon-tracing-tracer-resolver, helidon-tracing-zipkin]
Used by: [helidon-integrations-common-rest, helidon-reactive-dbclient-tracing, helidon-security-integration-jersey, helidon-tracing-providers-opentracing, helidon-tracing-tracer-resolver, helidon-tracing-providers-zipkin]
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
opentracing-util: 0.33.0, Apache 2.0
opentracing-mock: 0.33.0, Apache 2.0
Expand Down Expand Up @@ -2778,7 +2778,7 @@ Used by: [helidon-microprofile-reactive-streams, helidon-reactive-dbclient-mongo
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
Simple Logging Facade for Java (SLF4J) QOS.ch
MIT
Used by: [helidon-logging-slf4j, helidon-lra-coordinator-server, helidon-messaging-kafka, helidon-microprofile-grpc-metrics, helidon-microprofile-grpc-server, helidon-tracing-jaeger]
Used by: [helidon-logging-slf4j, helidon-lra-coordinator-server, helidon-messaging-kafka, helidon-microprofile-grpc-metrics, helidon-microprofile-grpc-server, helidon-tracing-providers-jaeger]
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
Simple Logging Facade for Java (SLF4J )

Expand Down Expand Up @@ -3040,7 +3040,7 @@ See full text at the bottom of this document for license: EPL-2.0-plus-GPLv2-CPE
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
Zipkin Reporter Java The OpenZipkin Authors
Apache 2.0
Used by: [helidon-tracing-zipkin]
Used by: [helidon-tracing--providers-zipkin]
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
Zipkin Reporter for Java
Zipkin Sender: URLConnection (io.zipkin.reporter2:zipkin-sender-urlconnection)
Expand Down Expand Up @@ -7009,7 +7009,7 @@ decompression for Java., which can be obtained at:
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
opentelemetry-api OpenTelemetry authors
Apache 2.0
Used by: [helidon-tracing-opentelemetry]
Used by: [helidon-tracing-providers-opentelemetry]
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
OpenTelemetry Java (io.opentelemetry:opentelemetry-api)
Copyright (C) 2008 The Guava Authors
Expand All @@ -7032,7 +7032,7 @@ Apache License 2.0
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
opentelemetry-exporter-jaeger OpenTelemetry authors
Apache 2.0
Used by: [helidon-microprofile-tracing, helidon-tracing-jaeger, helidon-tracing-opentelemetry]
Used by: [helidon-microprofile-tracing, helidon-tracing-providers-jaeger, helidon-tracing-providers-opentelemetry]
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
OpenTelemetry Java (io.opentelemetry:opentelemetry-exporter-jaeger)
Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -7134,7 +7134,7 @@ Fourth Party Dependencies
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
opentelemetry-extension-trace-propagators OpenTelemetry authors
Apache 2.0
Used by: [helidon-tracing-opentelemetry]
Used by: [helidon-tracing-providers-opentelemetry]
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
OpenTelemetry Java (io.opentelemetry:opentelemetry-extension-trace-propagators)
Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -7162,7 +7162,7 @@ Fourth Party Dependencies
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
opentelemetry-sdk OpenTelemetry authors
Apache 2.0
Used by: [helidon-tracing-jaeger]
Used by: [helidon-tracing-providers-jaeger]
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
OpenTelemetry Java (io.opentelemetry:opentelemetry-sdk)
Copyright The OpenTelemetry Authors
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,8 @@ curl -s -X GET http://localhost:8080/health
<model>
<list key="dependencies">
<map order="800">
<value key="groupId">io.helidon.tracing</value>
<value key="artifactId">helidon-tracing-jaeger</value>
<value key="groupId">io.helidon.tracing.providers</value>
<value key="artifactId">helidon-tracing-providers-jaeger</value>
</map>
</list>
<list key="readme-sections">
Expand All @@ -366,8 +366,8 @@ curl -s -X GET http://localhost:8080/health
<model>
<list key="dependencies">
<map order="800">
<value key="groupId">io.helidon.tracing</value>
<value key="artifactId">helidon-tracing-zipkin</value>
<value key="groupId">io.helidon.tracing.providers</value>
<value key="artifactId">helidon-tracing-providers-zipkin</value>
</map>
</list>
<list key="readme-sections">
Expand Down
16 changes: 8 additions & 8 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -588,14 +588,14 @@
</dependency>
<dependency>
<!-- to add tracer builder -->
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-opentracing</artifactId>
<groupId>io.helidon.tracing.providers</groupId>
<artifactId>helidon-tracing-providers-opentracing</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<!-- to add tracer builder -->
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-opentelemetry</artifactId>
<groupId>io.helidon.tracing.providers</groupId>
<artifactId>helidon-tracing-providers-opentelemetry</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
Expand All @@ -606,14 +606,14 @@
</dependency>
<dependency>
<!-- to add Zipkin support -->
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-zipkin</artifactId>
<groupId>io.helidon.tracing.providers</groupId>
<artifactId>helidon-tracing-providers-zipkin</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<!-- to add Jaeger support -->
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-jaeger</artifactId>
<groupId>io.helidon.tracing.providers</groupId>
<artifactId>helidon-tracing-providers-jaeger</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions docs/includes/tracing/tracer-jaeger.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////

Copyright (c) 2019, 2022 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.
Expand Down Expand Up @@ -36,7 +36,7 @@ include::{rootdir}/includes/dependencies.adoc[]
----
<dependency>
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-jaeger</artifactId>
<artifactId>helidon-tracing-providers-jaeger</artifactId>
</dependency>
----
// end::jaeger-dependency[]
Expand Down
6 changes: 3 additions & 3 deletions docs/includes/tracing/tracer-zipkin.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////

Copyright (c) 2019, 2022 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.
Expand Down Expand Up @@ -31,8 +31,8 @@ include::{rootdir}/includes/dependencies.adoc[]
[source,xml]
----
<dependency>
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-zipkin</artifactId>
<groupId>io.helidon.tracing.providers</groupId>
<artifactId>helidon-tracing-providers-zipkin</artifactId>
</dependency>
----
// end::zipkin-dependency[]
Expand Down
10 changes: 5 additions & 5 deletions docs/mp/guides/tracing.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////

Copyright (c) 2019, 2022 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.
Expand Down Expand Up @@ -130,8 +130,8 @@ default host and port, `localhost:9411`.
.Add the following dependency to `pom.xml`:
----
<dependency>
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-zipkin</artifactId>
<groupId>io.helidon.tracing.providers</groupId>
<artifactId>helidon-tracing-providers-zipkin</artifactId>
</dependency>
----

Expand Down Expand Up @@ -478,8 +478,8 @@ cd helidon-quickstart-mp-2
.Add the following dependency to `pom.xml`:
----
<dependency>
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-zipkin</artifactId>
<groupId>io.helidon.tracing.providers</groupId>
<artifactId>helidon-tracing-providers-zipkin</artifactId>
</dependency>
----

Expand Down
8 changes: 4 additions & 4 deletions docs/mp/tracing.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@ default host and port, `localhost:9411`.
.Add the following dependency to `pom.xml`:
----
<dependency>
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-zipkin</artifactId>
<groupId>io.helidon.tracing.providers</groupId>
<artifactId>helidon-tracing-providers-zipkin</artifactId>
</dependency>
----

Expand Down Expand Up @@ -560,8 +560,8 @@ cd helidon-quickstart-mp-2
.Add the following dependency to `pom.xml`:
----
<dependency>
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-zipkin</artifactId>
<groupId>io.helidon.tracing.providers</groupId>
<artifactId>helidon-tracing-providers-zipkin</artifactId>
</dependency>
----

Expand Down
10 changes: 5 additions & 5 deletions docs/se/guides/tracing.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////

Copyright (c) 2019, 2022 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.
Expand Down Expand Up @@ -133,8 +133,8 @@ default host and port, `localhost:9411`.
<artifactId>helidon-tracing</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-zipkin</artifactId>
<groupId>io.helidon.tracing.providers</groupId>
<artifactId>helidon-tracing-providers-zipkin</artifactId>
</dependency>
----

Expand Down Expand Up @@ -352,8 +352,8 @@ cd helidon-quickstart-se-2
<artifactId>helidon-tracing</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-zipkin</artifactId>
<groupId>io.helidon.tracing.providers</groupId>
<artifactId>helidon-tracing-providers-zipkin</artifactId>
</dependency>
----

Expand Down
20 changes: 10 additions & 10 deletions etc/HELIDON_THIRD_PARTY_LICENSES.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<licensor>The OpenZipkin Authors</licensor>
<licenseName>Apache 2.0</licenseName>
<consumers>
<consumer>helidon-tracing-zipkin</consumer>
<consumer>helidon-tracing-providers-zipkin</consumer>
</consumers>
<attribution>Zipkin OpenTracing Brave (io.opentracing.brave:brave-opentracing)
Copyright 2016-2020 The OpenZipkin Authors
Expand Down Expand Up @@ -3073,9 +3073,9 @@ Fourth Party Runtime Dependencies
<consumer>helidon-integrations-common-rest</consumer>
<consumer>helidon-reactive-dbclient-tracing</consumer>
<consumer>helidon-security-integration-jersey</consumer>
<consumer>helidon-tracing-opentracing</consumer>
<consumer>helidon-tracing-providers-opentracing</consumer>
<consumer>helidon-tracing-tracer-resolver</consumer>
<consumer>helidon-tracing-zipkin</consumer>
<consumer>helidon-tracing-providers-zipkin</consumer>
</consumers>
<attribution>opentracing-util: 0.33.0, Apache 2.0
opentracing-mock: 0.33.0, Apache 2.0
Expand Down Expand Up @@ -3146,7 +3146,7 @@ See full text at the bottom of this document for license: Apache-2.0
<consumer>helidon-messaging-kafka</consumer>
<consumer>helidon-microprofile-grpc-metrics</consumer>
<consumer>helidon-microprofile-grpc-server</consumer>
<consumer>helidon-tracing-jaeger</consumer>
<consumer>helidon-tracing-providers-jaeger</consumer>
</consumers>
<attribution>Simple Logging Facade for Java (SLF4J )

Expand Down Expand Up @@ -3442,7 +3442,7 @@ See full text at the bottom of this document for license: EPL-2.0-plus-GPLv2-CPE
<licensor>The OpenZipkin Authors</licensor>
<licenseName>Apache 2.0</licenseName>
<consumers>
<consumer>helidon-tracing-zipkin</consumer>
<consumer>helidon-tracing-providers-zipkin</consumer>
</consumers>
<attribution>Zipkin Reporter for Java
Zipkin Sender: URLConnection (io.zipkin.reporter2:zipkin-sender-urlconnection)
Expand Down Expand Up @@ -7584,7 +7584,7 @@ decompression for Java., which can be obtained at:
<licensor>OpenTelemetry authors</licensor>
<licenseName>Apache 2.0</licenseName>
<consumers>
<consumer>helidon-tracing-opentelemetry</consumer>
<consumer>helidon-tracing-providers-opentelemetry</consumer>
</consumers>
<attribution>OpenTelemetry Java (io.opentelemetry:opentelemetry-api)
Copyright (C) 2008 The Guava Authors
Expand Down Expand Up @@ -7613,8 +7613,8 @@ Apache License 2.0
<licenseName>Apache 2.0</licenseName>
<consumers>
<consumer>helidon-microprofile-tracing</consumer>
<consumer>helidon-tracing-jaeger</consumer>
<consumer>helidon-tracing-opentelemetry</consumer>
<consumer>helidon-tracing-providers-jaeger</consumer>
<consumer>helidon-tracing-providers-opentelemetry</consumer>
</consumers>
<attribution>OpenTelemetry Java (io.opentelemetry:opentelemetry-exporter-jaeger)
Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -7721,7 +7721,7 @@ Fourth Party Dependencies
<licensor>OpenTelemetry authors</licensor>
<licenseName>Apache 2.0</licenseName>
<consumers>
<consumer>helidon-tracing-opentelemetry</consumer>
<consumer>helidon-tracing-providers-opentelemetry</consumer>
</consumers>
<attribution>OpenTelemetry Java (io.opentelemetry:opentelemetry-extension-trace-propagators)
Copyright The OpenTelemetry Authors
Expand Down Expand Up @@ -7754,7 +7754,7 @@ Fourth Party Dependencies
<licensor>OpenTelemetry authors</licensor>
<licenseName>Apache 2.0</licenseName>
<consumers>
<consumer>helidon-tracing-jaeger</consumer>
<consumer>helidon-tracing-providers-jaeger</consumer>
</consumers>
<attribution>OpenTelemetry Java (io.opentelemetry:opentelemetry-sdk)
Copyright The OpenTelemetry Authors
Expand Down
4 changes: 2 additions & 2 deletions examples/dbclient/jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<artifactId>helidon-tracing</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-zipkin</artifactId>
<groupId>io.helidon.tracing.providers</groupId>
<artifactId>helidon-tracing-providers-zipkin</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.dbclient</groupId>
Expand Down
4 changes: 2 additions & 2 deletions examples/dbclient/mongodb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
<artifactId>helidon-tracing</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-zipkin</artifactId>
<groupId>io.helidon.tracing.providers</groupId>
<artifactId>helidon-tracing-providers-zipkin</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
Expand Down
4 changes: 2 additions & 2 deletions examples/dbclient/pokemons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
<artifactId>helidon-tracing</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-zipkin</artifactId>
<groupId>io.helidon.tracing.providers</groupId>
<artifactId>helidon-tracing-providers-zipkin</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.dbclient</groupId>
Expand Down
4 changes: 2 additions & 2 deletions examples/metrics/exemplar/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
<artifactId>helidon-metrics-trace-exemplar</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-zipkin</artifactId>
<groupId>io.helidon.tracing.providers</groupId>
<artifactId>helidon-tracing-providers-zipkin</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
Expand Down
4 changes: 2 additions & 2 deletions examples/nima/tracing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
<artifactId>helidon-nima-webclient-tracing</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-jaeger</artifactId>
<groupId>io.helidon.tracing.providers</groupId>
<artifactId>helidon-tracing-providers-jaeger</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
Expand Down
4 changes: 2 additions & 2 deletions examples/todo-app/backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@
<artifactId>helidon-microprofile-tracing</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.tracing</groupId>
<artifactId>helidon-tracing-zipkin</artifactId>
<groupId>io.helidon.tracing.providers</groupId>
<artifactId>helidon-tracing-providers-zipkin</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down
Loading