Skip to content

Commit 808141c

Browse files
dalexandrovdalexandrov
authored
[4.x] - Refactor to Tracing providers (helidon-io#7264)
Refactor to Tracing providers Signed-off-by: Dmitry Aleksandrov <dmitry.aleksandrov@oracle.com>
1 parent 8b5eafd commit 808141c

104 files changed

Lines changed: 285 additions & 242 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎THIRD_PARTY_LICENSES.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ of Helidon. They are identified by the Helidon module(s) that use them.
66
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
77
Brave OpenTracing Java Bridge for Zipkin The OpenZipkin Authors
88
Apache 2.0
9-
Used by: [helidon-tracing-zipkin]
9+
Used by: [helidon-tracing-providers-zipkin]
1010
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
1111
Zipkin OpenTracing Brave (io.opentracing.brave:brave-opentracing)
1212
Copyright 2016-2020 The OpenZipkin Authors
@@ -2730,7 +2730,7 @@ Fourth Party Runtime Dependencies
27302730
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
27312731
OpenTracing API for Java Opentracing.Io
27322732
Apache 2.0
2733-
Used by: [helidon-integrations-common-rest, helidon-reactive-dbclient-tracing, helidon-security-integration-jersey, helidon-tracing-opentracing, helidon-tracing-tracer-resolver, helidon-tracing-zipkin]
2733+
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]
27342734
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
27352735
opentracing-util: 0.33.0, Apache 2.0
27362736
opentracing-mock: 0.33.0, Apache 2.0
@@ -2778,7 +2778,7 @@ Used by: [helidon-microprofile-reactive-streams, helidon-reactive-dbclient-mongo
27782778
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
27792779
Simple Logging Facade for Java (SLF4J) QOS.ch
27802780
MIT
2781-
Used by: [helidon-logging-slf4j, helidon-lra-coordinator-server, helidon-messaging-kafka, helidon-microprofile-grpc-metrics, helidon-microprofile-grpc-server, helidon-tracing-jaeger]
2781+
Used by: [helidon-logging-slf4j, helidon-lra-coordinator-server, helidon-messaging-kafka, helidon-microprofile-grpc-metrics, helidon-microprofile-grpc-server, helidon-tracing-providers-jaeger]
27822782
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
27832783
Simple Logging Facade for Java (SLF4J )
27842784

@@ -3040,7 +3040,7 @@ See full text at the bottom of this document for license: EPL-2.0-plus-GPLv2-CPE
30403040
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
30413041
Zipkin Reporter Java The OpenZipkin Authors
30423042
Apache 2.0
3043-
Used by: [helidon-tracing-zipkin]
3043+
Used by: [helidon-tracing--providers-zipkin]
30443044
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
30453045
Zipkin Reporter for Java
30463046
Zipkin Sender: URLConnection (io.zipkin.reporter2:zipkin-sender-urlconnection)
@@ -7009,7 +7009,7 @@ decompression for Java., which can be obtained at:
70097009
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
70107010
opentelemetry-api OpenTelemetry authors
70117011
Apache 2.0
7012-
Used by: [helidon-tracing-opentelemetry]
7012+
Used by: [helidon-tracing-providers-opentelemetry]
70137013
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
70147014
OpenTelemetry Java (io.opentelemetry:opentelemetry-api)
70157015
Copyright (C) 2008 The Guava Authors
@@ -7032,7 +7032,7 @@ Apache License 2.0
70327032
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
70337033
opentelemetry-exporter-jaeger OpenTelemetry authors
70347034
Apache 2.0
7035-
Used by: [helidon-microprofile-tracing, helidon-tracing-jaeger, helidon-tracing-opentelemetry]
7035+
Used by: [helidon-microprofile-tracing, helidon-tracing-providers-jaeger, helidon-tracing-providers-opentelemetry]
70367036
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
70377037
OpenTelemetry Java (io.opentelemetry:opentelemetry-exporter-jaeger)
70387038
Copyright The OpenTelemetry Authors
@@ -7134,7 +7134,7 @@ Fourth Party Dependencies
71347134
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
71357135
opentelemetry-extension-trace-propagators OpenTelemetry authors
71367136
Apache 2.0
7137-
Used by: [helidon-tracing-opentelemetry]
7137+
Used by: [helidon-tracing-providers-opentelemetry]
71387138
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
71397139
OpenTelemetry Java (io.opentelemetry:opentelemetry-extension-trace-propagators)
71407140
Copyright The OpenTelemetry Authors
@@ -7162,7 +7162,7 @@ Fourth Party Dependencies
71627162
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
71637163
opentelemetry-sdk OpenTelemetry authors
71647164
Apache 2.0
7165-
Used by: [helidon-tracing-jaeger]
7165+
Used by: [helidon-tracing-providers-jaeger]
71667166
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
71677167
OpenTelemetry Java (io.opentelemetry:opentelemetry-sdk)
71687168
Copyright The OpenTelemetry Authors

‎archetypes/helidon/src/main/archetype/common/observability.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,8 @@ curl -s -X GET http://localhost:8080/health
346346
<model>
347347
<list key="dependencies">
348348
<map order="800">
349-
<value key="groupId">io.helidon.tracing</value>
350-
<value key="artifactId">helidon-tracing-jaeger</value>
349+
<value key="groupId">io.helidon.tracing.providers</value>
350+
<value key="artifactId">helidon-tracing-providers-jaeger</value>
351351
</map>
352352
</list>
353353
<list key="readme-sections">
@@ -366,8 +366,8 @@ curl -s -X GET http://localhost:8080/health
366366
<model>
367367
<list key="dependencies">
368368
<map order="800">
369-
<value key="groupId">io.helidon.tracing</value>
370-
<value key="artifactId">helidon-tracing-zipkin</value>
369+
<value key="groupId">io.helidon.tracing.providers</value>
370+
<value key="artifactId">helidon-tracing-providers-zipkin</value>
371371
</map>
372372
</list>
373373
<list key="readme-sections">

‎bom/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -582,14 +582,14 @@
582582
</dependency>
583583
<dependency>
584584
<!-- to add tracer builder -->
585-
<groupId>io.helidon.tracing</groupId>
586-
<artifactId>helidon-tracing-opentracing</artifactId>
585+
<groupId>io.helidon.tracing.providers</groupId>
586+
<artifactId>helidon-tracing-providers-opentracing</artifactId>
587587
<version>${helidon.version}</version>
588588
</dependency>
589589
<dependency>
590590
<!-- to add tracer builder -->
591-
<groupId>io.helidon.tracing</groupId>
592-
<artifactId>helidon-tracing-opentelemetry</artifactId>
591+
<groupId>io.helidon.tracing.providers</groupId>
592+
<artifactId>helidon-tracing-providers-opentelemetry</artifactId>
593593
<version>${helidon.version}</version>
594594
</dependency>
595595
<dependency>
@@ -600,14 +600,14 @@
600600
</dependency>
601601
<dependency>
602602
<!-- to add Zipkin support -->
603-
<groupId>io.helidon.tracing</groupId>
604-
<artifactId>helidon-tracing-zipkin</artifactId>
603+
<groupId>io.helidon.tracing.providers</groupId>
604+
<artifactId>helidon-tracing-providers-zipkin</artifactId>
605605
<version>${helidon.version}</version>
606606
</dependency>
607607
<dependency>
608608
<!-- to add Jaeger support -->
609-
<groupId>io.helidon.tracing</groupId>
610-
<artifactId>helidon-tracing-jaeger</artifactId>
609+
<groupId>io.helidon.tracing.providers</groupId>
610+
<artifactId>helidon-tracing-providers-jaeger</artifactId>
611611
<version>${helidon.version}</version>
612612
</dependency>
613613
<dependency>

‎docs/includes/tracing/tracer-jaeger.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
///////////////////////////////////////////////////////////////////////////////
22

3-
Copyright (c) 2019, 2022 Oracle and/or its affiliates.
3+
Copyright (c) 2019, 2023 Oracle and/or its affiliates.
44

55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ include::{rootdir}/includes/dependencies.adoc[]
3636
----
3737
<dependency>
3838
<groupId>io.helidon.tracing</groupId>
39-
<artifactId>helidon-tracing-jaeger</artifactId>
39+
<artifactId>helidon-tracing-providers-jaeger</artifactId>
4040
</dependency>
4141
----
4242
// end::jaeger-dependency[]

‎docs/includes/tracing/tracer-zipkin.adoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
///////////////////////////////////////////////////////////////////////////////
22

3-
Copyright (c) 2019, 2022 Oracle and/or its affiliates.
3+
Copyright (c) 2019, 2023 Oracle and/or its affiliates.
44

55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -31,8 +31,8 @@ include::{rootdir}/includes/dependencies.adoc[]
3131
[source,xml]
3232
----
3333
<dependency>
34-
<groupId>io.helidon.tracing</groupId>
35-
<artifactId>helidon-tracing-zipkin</artifactId>
34+
<groupId>io.helidon.tracing.providers</groupId>
35+
<artifactId>helidon-tracing-providers-zipkin</artifactId>
3636
</dependency>
3737
----
3838
// end::zipkin-dependency[]

‎docs/mp/guides/tracing.adoc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
///////////////////////////////////////////////////////////////////////////////
22

3-
Copyright (c) 2019, 2022 Oracle and/or its affiliates.
3+
Copyright (c) 2019, 2023 Oracle and/or its affiliates.
44

55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -130,8 +130,8 @@ default host and port, `localhost:9411`.
130130
.Add the following dependency to `pom.xml`:
131131
----
132132
<dependency>
133-
<groupId>io.helidon.tracing</groupId>
134-
<artifactId>helidon-tracing-zipkin</artifactId>
133+
<groupId>io.helidon.tracing.providers</groupId>
134+
<artifactId>helidon-tracing-providers-zipkin</artifactId>
135135
</dependency>
136136
----
137137
@@ -478,8 +478,8 @@ cd helidon-quickstart-mp-2
478478
.Add the following dependency to `pom.xml`:
479479
----
480480
<dependency>
481-
<groupId>io.helidon.tracing</groupId>
482-
<artifactId>helidon-tracing-zipkin</artifactId>
481+
<groupId>io.helidon.tracing.providers</groupId>
482+
<artifactId>helidon-tracing-providers-zipkin</artifactId>
483483
</dependency>
484484
----
485485

‎docs/mp/tracing.adoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ default host and port, `localhost:9411`.
207207
.Add the following dependency to `pom.xml`:
208208
----
209209
<dependency>
210-
<groupId>io.helidon.tracing</groupId>
211-
<artifactId>helidon-tracing-zipkin</artifactId>
210+
<groupId>io.helidon.tracing.providers</groupId>
211+
<artifactId>helidon-tracing-providers-zipkin</artifactId>
212212
</dependency>
213213
----
214214
@@ -560,8 +560,8 @@ cd helidon-quickstart-mp-2
560560
.Add the following dependency to `pom.xml`:
561561
----
562562
<dependency>
563-
<groupId>io.helidon.tracing</groupId>
564-
<artifactId>helidon-tracing-zipkin</artifactId>
563+
<groupId>io.helidon.tracing.providers</groupId>
564+
<artifactId>helidon-tracing-providers-zipkin</artifactId>
565565
</dependency>
566566
----
567567

‎docs/se/guides/tracing.adoc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
///////////////////////////////////////////////////////////////////////////////
22

3-
Copyright (c) 2019, 2022 Oracle and/or its affiliates.
3+
Copyright (c) 2019, 2023 Oracle and/or its affiliates.
44

55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -133,8 +133,8 @@ default host and port, `localhost:9411`.
133133
<artifactId>helidon-tracing</artifactId>
134134
</dependency>
135135
<dependency>
136-
<groupId>io.helidon.tracing</groupId>
137-
<artifactId>helidon-tracing-zipkin</artifactId>
136+
<groupId>io.helidon.tracing.providers</groupId>
137+
<artifactId>helidon-tracing-providers-zipkin</artifactId>
138138
</dependency>
139139
----
140140
@@ -352,8 +352,8 @@ cd helidon-quickstart-se-2
352352
<artifactId>helidon-tracing</artifactId>
353353
</dependency>
354354
<dependency>
355-
<groupId>io.helidon.tracing</groupId>
356-
<artifactId>helidon-tracing-zipkin</artifactId>
355+
<groupId>io.helidon.tracing.providers</groupId>
356+
<artifactId>helidon-tracing-providers-zipkin</artifactId>
357357
</dependency>
358358
----
359359

‎etc/HELIDON_THIRD_PARTY_LICENSES.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<licensor>The OpenZipkin Authors</licensor>
99
<licenseName>Apache 2.0</licenseName>
1010
<consumers>
11-
<consumer>helidon-tracing-zipkin</consumer>
11+
<consumer>helidon-tracing-providers-zipkin</consumer>
1212
</consumers>
1313
<attribution>Zipkin OpenTracing Brave (io.opentracing.brave:brave-opentracing)
1414
Copyright 2016-2020 The OpenZipkin Authors
@@ -3073,9 +3073,9 @@ Fourth Party Runtime Dependencies
30733073
<consumer>helidon-integrations-common-rest</consumer>
30743074
<consumer>helidon-reactive-dbclient-tracing</consumer>
30753075
<consumer>helidon-security-integration-jersey</consumer>
3076-
<consumer>helidon-tracing-opentracing</consumer>
3076+
<consumer>helidon-tracing-providers-opentracing</consumer>
30773077
<consumer>helidon-tracing-tracer-resolver</consumer>
3078-
<consumer>helidon-tracing-zipkin</consumer>
3078+
<consumer>helidon-tracing-providers-zipkin</consumer>
30793079
</consumers>
30803080
<attribution>opentracing-util: 0.33.0, Apache 2.0
30813081
opentracing-mock: 0.33.0, Apache 2.0
@@ -3146,7 +3146,7 @@ See full text at the bottom of this document for license: Apache-2.0
31463146
<consumer>helidon-messaging-kafka</consumer>
31473147
<consumer>helidon-microprofile-grpc-metrics</consumer>
31483148
<consumer>helidon-microprofile-grpc-server</consumer>
3149-
<consumer>helidon-tracing-jaeger</consumer>
3149+
<consumer>helidon-tracing-providers-jaeger</consumer>
31503150
</consumers>
31513151
<attribution>Simple Logging Facade for Java (SLF4J )
31523152

@@ -3442,7 +3442,7 @@ See full text at the bottom of this document for license: EPL-2.0-plus-GPLv2-CPE
34423442
<licensor>The OpenZipkin Authors</licensor>
34433443
<licenseName>Apache 2.0</licenseName>
34443444
<consumers>
3445-
<consumer>helidon-tracing-zipkin</consumer>
3445+
<consumer>helidon-tracing-providers-zipkin</consumer>
34463446
</consumers>
34473447
<attribution>Zipkin Reporter for Java
34483448
Zipkin Sender: URLConnection (io.zipkin.reporter2:zipkin-sender-urlconnection)
@@ -7584,7 +7584,7 @@ decompression for Java., which can be obtained at:
75847584
<licensor>OpenTelemetry authors</licensor>
75857585
<licenseName>Apache 2.0</licenseName>
75867586
<consumers>
7587-
<consumer>helidon-tracing-opentelemetry</consumer>
7587+
<consumer>helidon-tracing-providers-opentelemetry</consumer>
75887588
</consumers>
75897589
<attribution>OpenTelemetry Java (io.opentelemetry:opentelemetry-api)
75907590
Copyright (C) 2008 The Guava Authors
@@ -7613,8 +7613,8 @@ Apache License 2.0
76137613
<licenseName>Apache 2.0</licenseName>
76147614
<consumers>
76157615
<consumer>helidon-microprofile-tracing</consumer>
7616-
<consumer>helidon-tracing-jaeger</consumer>
7617-
<consumer>helidon-tracing-opentelemetry</consumer>
7616+
<consumer>helidon-tracing-providers-jaeger</consumer>
7617+
<consumer>helidon-tracing-providers-opentelemetry</consumer>
76187618
</consumers>
76197619
<attribution>OpenTelemetry Java (io.opentelemetry:opentelemetry-exporter-jaeger)
76207620
Copyright The OpenTelemetry Authors
@@ -7721,7 +7721,7 @@ Fourth Party Dependencies
77217721
<licensor>OpenTelemetry authors</licensor>
77227722
<licenseName>Apache 2.0</licenseName>
77237723
<consumers>
7724-
<consumer>helidon-tracing-opentelemetry</consumer>
7724+
<consumer>helidon-tracing-providers-opentelemetry</consumer>
77257725
</consumers>
77267726
<attribution>OpenTelemetry Java (io.opentelemetry:opentelemetry-extension-trace-propagators)
77277727
Copyright The OpenTelemetry Authors
@@ -7754,7 +7754,7 @@ Fourth Party Dependencies
77547754
<licensor>OpenTelemetry authors</licensor>
77557755
<licenseName>Apache 2.0</licenseName>
77567756
<consumers>
7757-
<consumer>helidon-tracing-jaeger</consumer>
7757+
<consumer>helidon-tracing-providers-jaeger</consumer>
77587758
</consumers>
77597759
<attribution>OpenTelemetry Java (io.opentelemetry:opentelemetry-sdk)
77607760
Copyright The OpenTelemetry Authors

‎examples/dbclient/jdbc/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<artifactId>helidon-tracing</artifactId>
4040
</dependency>
4141
<dependency>
42-
<groupId>io.helidon.tracing</groupId>
43-
<artifactId>helidon-tracing-zipkin</artifactId>
42+
<groupId>io.helidon.tracing.providers</groupId>
43+
<artifactId>helidon-tracing-providers-zipkin</artifactId>
4444
</dependency>
4545
<dependency>
4646
<groupId>io.helidon.dbclient</groupId>

0 commit comments

Comments
 (0)