This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch CXF-8671
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/CXF-8671 by this push:
new c3717209a4 Revamped io.opentelemetry.semconv:* dependencies since
Micrometer Tracing brings conflicting ones
c3717209a4 is described below
commit c3717209a46587385bb40e45bf178e7508ee5504
Author: Andriy Redko <[email protected]>
AuthorDate: Thu Apr 4 15:22:14 2024 -0400
Revamped io.opentelemetry.semconv:* dependencies since Micrometer Tracing
brings conflicting ones
---
distribution/javadoc/pom.xml | 2 ++
.../src/main/release/samples/jax_rs/tracing_micrometer/pom.xml | 8 --------
.../src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java | 4 ++--
.../main/release/samples/jax_rs/tracing_opentelemetry/pom.xml | 8 --------
.../release/samples/jax_rs/tracing_opentelemetry_camel/pom.xml | 8 --------
integration/tracing/tracing-opentelemetry/pom.xml | 2 ++
parent/pom.xml | 10 ----------
7 files changed, 6 insertions(+), 36 deletions(-)
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index d9dadd2dc0..731ffb43e7 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -389,10 +389,12 @@
<dependency>
<groupId>io.opentelemetry.semconv</groupId>
<artifactId>opentelemetry-semconv</artifactId>
+ <version>${cxf.opentelemetry.semconv.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry.semconv</groupId>
<artifactId>opentelemetry-semconv-incubating</artifactId>
+ <version>${cxf.opentelemetry.semconv.version}</version>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml
b/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml
index 1803dc2b97..c47ad59fce 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml
@@ -151,13 +151,5 @@
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-logging</artifactId>
</dependency>
- <dependency>
- <groupId>io.opentelemetry.semconv</groupId>
- <artifactId>opentelemetry-semconv</artifactId>
- </dependency>
- <dependency>
- <groupId>io.opentelemetry.semconv</groupId>
- <artifactId>opentelemetry-semconv-incubating</artifactId>
- </dependency>
</dependencies>
</project>
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
b/distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
index 14f8bcfd80..3d7eb6aad0 100644
---
a/distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
+++
b/distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
@@ -26,12 +26,12 @@ import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.resources.Resource;
import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
-import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
public class OpenTelemetrySetup {
public static OpenTelemetrySdk setup(String serviceName) {
final Resource resource = Resource.getDefault()
-
.merge(Resource.create(Attributes.of(ServiceIncubatingAttributes.SERVICE_NAME,
serviceName)));
+
.merge(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME,
serviceName)));
final SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
.addSpanProcessor(BatchSpanProcessor.builder(LoggingSpanExporter.create()).build())
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
index cf5350718e..4460a05da0 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
@@ -151,14 +151,6 @@
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk</artifactId>
</dependency>
- <dependency>
- <groupId>io.opentelemetry.semconv</groupId>
- <artifactId>opentelemetry-semconv</artifactId>
- </dependency>
- <dependency>
- <groupId>io.opentelemetry.semconv</groupId>
- <artifactId>opentelemetry-semconv-incubating</artifactId>
- </dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-logging</artifactId>
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/pom.xml
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/pom.xml
index 0e85653ae4..f0a5d60eb7 100644
---
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/pom.xml
+++
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/pom.xml
@@ -216,14 +216,6 @@
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-otlp</artifactId>
</dependency>
- <dependency>
- <groupId>io.opentelemetry.semconv</groupId>
- <artifactId>opentelemetry-semconv</artifactId>
- </dependency>
- <dependency>
- <groupId>io.opentelemetry.semconv</groupId>
- <artifactId>opentelemetry-semconv-incubating</artifactId>
- </dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-sender-okhttp</artifactId>
diff --git a/integration/tracing/tracing-opentelemetry/pom.xml
b/integration/tracing/tracing-opentelemetry/pom.xml
index fbc57332d1..123b6fd105 100644
--- a/integration/tracing/tracing-opentelemetry/pom.xml
+++ b/integration/tracing/tracing-opentelemetry/pom.xml
@@ -80,10 +80,12 @@
<dependency>
<groupId>io.opentelemetry.semconv</groupId>
<artifactId>opentelemetry-semconv</artifactId>
+ <version>${cxf.opentelemetry.semconv.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry.semconv</groupId>
<artifactId>opentelemetry-semconv-incubating</artifactId>
+ <version>${cxf.opentelemetry.semconv.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6b384605d2..01f9c73bbf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1938,16 +1938,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>io.opentelemetry.semconv</groupId>
- <artifactId>opentelemetry-semconv</artifactId>
- <version>${cxf.opentelemetry.semconv.version}</version>
- </dependency>
- <dependency>
- <groupId>io.opentelemetry.semconv</groupId>
- <artifactId>opentelemetry-semconv-incubating</artifactId>
- <version>${cxf.opentelemetry.semconv.version}</version>
- </dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-opentracing-shim</artifactId>
