This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 63a6c3a1765d298135cae22536d6b743cd942a83
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Oct 12 09:11:33 2023 -0400
Bump cxf.opentelemetry.version from 1.30.1 to 1.31.0 (#1463)
Bumps `cxf.opentelemetry.version` from 1.30.1 to 1.31.0.
Updates `io.opentelemetry:opentelemetry-bom` from 1.30.1 to 1.31.0
- [Release
notes](https://github.com/open-telemetry/opentelemetry-java/releases)
-
[Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
-
[Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.30.1...v1.31.0)
Updates `io.opentelemetry:opentelemetry-opentracing-shim` from 1.30.1 to
1.31.0
- [Release
notes](https://github.com/open-telemetry/opentelemetry-java/releases)
-
[Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
-
[Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.30.1...v1.31.0)
---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-bom
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.opentelemetry:opentelemetry-opentracing-shim
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 3b5bd6d81dcd3171faa1546e86e18864f587c2ac)
# Conflicts:
#
distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
#
distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml
# parent/pom.xml
---
distribution/javadoc/pom.xml | 2 +-
.../main/release/samples/jax_rs/description_swagger2_spring/pom.xml | 4 ++++
.../src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml | 2 +-
.../src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java | 2 +-
integration/tracing/tracing-opentelemetry/pom.xml | 2 +-
.../tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java | 2 +-
.../cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java | 2 +-
parent/pom.xml | 6 +++---
.../jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java | 2 +-
.../jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java | 2 +-
10 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 5cdc73d7b5..fda41ebf04 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -415,7 +415,7 @@
<artifactId>opentelemetry-api</artifactId>
</dependency>
<dependency>
- <groupId>io.opentelemetry</groupId>
+ <groupId>io.opentelemetry.semconv</groupId>
<artifactId>opentelemetry-semconv</artifactId>
</dependency>
<dependency>
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
index f5bcf6d316..2edb4783bd 100644
---
a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
@@ -98,5 +98,9 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.opentelemetry.semconv</groupId>
+ <artifactId>opentelemetry-semconv</artifactId>
+ </dependency>
</dependencies>
</project>
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 b748980e41..0382f5b9fd 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,7 +151,7 @@
<artifactId>opentelemetry-sdk</artifactId>
</dependency>
<dependency>
- <groupId>io.opentelemetry</groupId>
+ <groupId>io.opentelemetry.semconv</groupId>
<artifactId>opentelemetry-semconv</artifactId>
</dependency>
<dependency>
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
index e60290ec7d..5e9fae4778 100644
---
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
+++
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
@@ -27,7 +27,7 @@ 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.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
import io.opentracing.util.GlobalTracer;
public class OpenTelemetrySetup {
diff --git a/integration/tracing/tracing-opentelemetry/pom.xml
b/integration/tracing/tracing-opentelemetry/pom.xml
index 9a2bc4a295..2753db4e9f 100644
--- a/integration/tracing/tracing-opentelemetry/pom.xml
+++ b/integration/tracing/tracing-opentelemetry/pom.xml
@@ -78,7 +78,7 @@
<artifactId>opentelemetry-api</artifactId>
</dependency>
<dependency>
- <groupId>io.opentelemetry</groupId>
+ <groupId>io.opentelemetry.semconv</groupId>
<artifactId>opentelemetry-semconv</artifactId>
</dependency>
<dependency>
diff --git
a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java
b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java
index 35727007cd..d2e5717eb6 100644
---
a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java
+++
b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java
@@ -36,7 +36,7 @@ import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
-import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import io.opentelemetry.semconv.SemanticAttributes;
public abstract class AbstractOpenTelemetryClientProvider extends
AbstractTracingProvider {
protected static final Logger LOG =
LogUtils.getL7dLogger(AbstractOpenTelemetryClientProvider.class);
diff --git
a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java
b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java
index c1f9a4c76a..d8ddda3e8d 100644
---
a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java
+++
b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java
@@ -35,7 +35,7 @@ import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
-import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import io.opentelemetry.semconv.SemanticAttributes;
public abstract class AbstractOpenTelemetryProvider extends
AbstractTracingProvider {
protected static final Logger LOG =
LogUtils.getL7dLogger(AbstractOpenTelemetryProvider.class);
diff --git a/parent/pom.xml b/parent/pom.xml
index 3384b22ac5..084a62d219 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -183,8 +183,8 @@
<cxf.openjpa.version>3.2.2</cxf.openjpa.version>
<cxf.opensaml.osgi.version.range>[3.1,4)</cxf.opensaml.osgi.version.range>
<cxf.opensaml.osgi.version>3.4.6_3</cxf.opensaml.osgi.version>
- <cxf.opentelemetry.version>1.30.1</cxf.opentelemetry.version>
-
<cxf.opentelemetry.semconv.version>${cxf.opentelemetry.version}-alpha</cxf.opentelemetry.semconv.version>
+ <cxf.opentelemetry.version>1.31.0</cxf.opentelemetry.version>
+
<cxf.opentelemetry.semconv.version>1.21.0-alpha</cxf.opentelemetry.semconv.version>
<cxf.opentracing.version>0.33.0</cxf.opentracing.version>
<cxf.openwebbeans.version>2.0.27</cxf.openwebbeans.version>
<cxf.persistence-api.version>2.2.3</cxf.persistence-api.version>
@@ -1901,7 +1901,7 @@
<scope>import</scope>
</dependency>
<dependency>
- <groupId>io.opentelemetry</groupId>
+ <groupId>io.opentelemetry.semconv</groupId>
<artifactId>opentelemetry-semconv</artifactId>
<version>${cxf.opentelemetry.semconv.version}</version>
</dependency>
diff --git
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java
index e86301e4ad..1a5df89044 100644
---
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java
+++
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java
@@ -62,7 +62,7 @@ import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.context.propagation.TextMapSetter;
import io.opentelemetry.sdk.testing.junit4.OpenTelemetryRule;
-import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import io.opentelemetry.semconv.SemanticAttributes;
import org.junit.After;
import org.junit.BeforeClass;
diff --git
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java
index 653804a46e..bab22a1ee1 100644
---
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java
+++
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java
@@ -53,7 +53,7 @@ import io.opentelemetry.api.trace.TraceState;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.sdk.testing.junit4.OpenTelemetryRule;
-import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import io.opentelemetry.semconv.SemanticAttributes;
import org.junit.After;
import org.junit.BeforeClass;
