You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2023/10/12 15:27:20 UTC
[cxf] branch 3.6.x-fixes updated (121d507418 -> 4d2dadfd9b)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 121d507418 Update Micrometer to 1.9.16
new 8c0bf137f4 Add JAX-WS tests for @Oneway methods to tracing suites
new 63a6c3a176 Bump cxf.opentelemetry.version from 1.30.1 to 1.31.0 (#1463)
new 4d2dadfd9b Recording .gitmergeinfo Changes
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 4 ++++
distribution/javadoc/pom.xml | 2 +-
.../samples/jax_rs/description_swagger2_spring/pom.xml | 4 ++++
.../samples/jax_rs/tracing_opentelemetry/pom.xml | 2 +-
.../java/demo/jaxrs/tracing/OpenTelemetrySetup.java | 2 +-
integration/tracing/tracing-opentelemetry/pom.xml | 2 +-
.../AbstractOpenTelemetryClientProvider.java | 2 +-
.../opentelemetry/AbstractOpenTelemetryProvider.java | 2 +-
parent/pom.xml | 6 +++---
.../tracing/opentelemetry/OpenTelemetryTracingTest.java | 2 +-
.../cxf/systest/jaxws/tracing/BookStoreService.java | 1 +
.../cxf/systest/jaxws/tracing/brave/BookStore.java | 6 ++++++
.../systest/jaxws/tracing/brave/BraveTracingTest.java | 17 +++++++++++++++++
.../systest/jaxws/tracing/opentelemetry/BookStore.java | 5 +++++
.../tracing/opentelemetry/OpenTelemetryTracingTest.java | 16 +++++++++++++++-
.../systest/jaxws/tracing/opentracing/BookStore.java | 5 +++++
.../tracing/opentracing/OpenTracingTracingTest.java | 13 +++++++++++++
17 files changed, 80 insertions(+), 11 deletions(-)
[cxf] 03/03: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
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 4d2dadfd9bf553d9d64c60a2b0f9e4588e9a1abf
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Oct 12 11:27:07 2023 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7f560b51e7..0445fa8f29 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -323,6 +323,7 @@ M 3a2897a5a01c657b2f2c5f87c855470cd092bc5f
M 3a2ec19943f621daa3d2126e4824ca598808ae89
M 3a5bf6699e32c4831f3a952535190df3da6fe1fa
M 3b3ff83cda8fdbea1848d31f8e7fdd54a4a2c4c6
+M 3b5bd6d81dcd3171faa1546e86e18864f587c2ac
M 3b700961ead8a1c23ef945275bfe4defe22ea81d
M 3ce2db9d160b107c41c5bcee595ee13d862b7b88
M 3ce7a90d8b6b96fed6ee74f95f268167e77842eb
@@ -366,6 +367,7 @@ M 4ec898213e8d5b2e12dfe4793ddd5129a41b99c3
M 4ed5741d56366e3fa4fdb659fecd90afa3610bdc
M 4edc769daa2dc39db68ce109d38f5722c89c1c62
M 4f30353a60a7a691a52052d1eaa4df9c15823ba1
+M 4f305be3ca9a184cc488d66f88f40bd40fc03d0b
M 4feb1632abee093808fff06e03cf9d951c3ac7c9
M 5147a509abcee1aa885f0fcace2d797e28347608
M 5183fbf3c51cac50aa96506a03b6884587cec8ec
@@ -375,6 +377,7 @@ M 546340afed9b6ccf0ca655605ce58287f7d16e5c
M 54919faf04751a1737b4edf95d8e2e7604bd3226
M 549bae9e692f84ccc1a2a6170fc9bdab2c7fc882
M 54d0bde599ba55482e6c7a9b98aa0a715b4789b3
+M 54e26b97a03b765a4757e7e24923e90db1dcea89
M 55265412d3c62ada4003a5f019477ea47eb49c8c
M 553da4b8131bce33a0242d625eca264a68aaf8ae
M 557bfc8a53164dbf6f7be4ad3b320c7854f2f8b6
@@ -407,6 +410,7 @@ M 61884fa661644d6863ce12d6d963b820cbdbce0b
M 61f049ba937bc38b5919dd00b687df2bba53f3c3
M 6276bff19345877a56ec0fbf81f22b6a1d7e7d1b
M 634758b2e0352a489e39cb96c9b834369fcb444f
+M 638c8896a1d4e8afbc611416e8b816c43033a016
M 63a2c2bbf4dcba37bd8fe669d35203f8eb0d019b
M 63af5b0839c960fa7ea377c820a5ed0096f3f90b
M 647408469988d9e244086efc839b2f6ab5e42cd7
[cxf] 01/03: Add JAX-WS tests for @Oneway methods to tracing suites
Posted by re...@apache.org.
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 8c0bf137f4f99a565c5034709a90ddf5515eec10
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Oct 11 19:45:41 2023 -0400
Add JAX-WS tests for @Oneway methods to tracing suites
(cherry picked from commit 638c8896a1d4e8afbc611416e8b816c43033a016)
# Conflicts:
# systests/tracing/src/test/java/org/apache/cxf/systest/brave/jaxws/AbstractBraveTracingTest.java
# systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java
# systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/BookStore.java
# systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/BookStore.java
---
.../cxf/systest/jaxws/tracing/BookStoreService.java | 1 +
.../cxf/systest/jaxws/tracing/brave/BookStore.java | 6 ++++++
.../systest/jaxws/tracing/brave/BraveTracingTest.java | 17 +++++++++++++++++
.../systest/jaxws/tracing/opentelemetry/BookStore.java | 5 +++++
.../tracing/opentelemetry/OpenTelemetryTracingTest.java | 14 ++++++++++++++
.../systest/jaxws/tracing/opentracing/BookStore.java | 5 +++++
.../tracing/opentracing/OpenTracingTracingTest.java | 13 +++++++++++++
7 files changed, 61 insertions(+)
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/BookStoreService.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/BookStoreService.java
index c6a58cf373..0df92a8202 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/BookStoreService.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/BookStoreService.java
@@ -29,4 +29,5 @@ public interface BookStoreService {
Collection< Book > getBooks();
int removeBooks();
void addBooks();
+ void orderBooks();
}
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java
index 2a1d254574..deb2f52888 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.UUID;
import javax.annotation.Resource;
+import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.xml.ws.WebServiceContext;
@@ -72,4 +73,9 @@ public class BookStore implements BookStoreService {
final MessageContext ctx = context.getMessageContext();
ctx.put(MessageContext.HTTP_RESPONSE_CODE, 305);
}
+
+ @WebMethod @Oneway
+ public void orderBooks() {
+ }
+
}
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
index d7c3d0b8d1..fc4a3a36dc 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.cxf.systest.jaxws.tracing.brave;
+import java.time.Duration;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
@@ -55,6 +56,7 @@ import static org.apache.cxf.systest.brave.BraveTestSupport.PARENT_SPAN_ID_NAME;
import static org.apache.cxf.systest.brave.BraveTestSupport.SAMPLED_NAME;
import static org.apache.cxf.systest.brave.BraveTestSupport.SPAN_ID_NAME;
import static org.apache.cxf.systest.brave.BraveTestSupport.TRACE_ID_NAME;
+import static org.awaitility.Awaitility.await;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
@@ -241,6 +243,21 @@ public class BraveTracingTest extends AbstractClientServerTestBase {
}
}
+ @Test
+ public void testThatNewInnerSpanIsCreatedOneway() throws Exception {
+ try (Tracing brave = createTracer()) {
+ final BookStoreService service = createJaxWsService(new BraveClientFeature(brave));
+ service.orderBooks();
+
+ // Await till flush happens, usually every second
+ await().atMost(Duration.ofSeconds(1L)).until(() -> TestSpanReporter.getAllSpans().size() == 2);
+
+ assertThat(TestSpanReporter.getAllSpans().get(0).name(), equalTo("post /bookstore"));
+ assertThat(TestSpanReporter.getAllSpans().get(1).name(),
+ equalTo("post http://localhost:" + PORT + "/bookstore"));
+ }
+ }
+
private BookStoreService createJaxWsService() {
return createJaxWsService(Collections.emptyMap());
}
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/BookStore.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/BookStore.java
index 829aa0f8f7..c7a1b05426 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/BookStore.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/BookStore.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.UUID;
import javax.annotation.Resource;
+import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.xml.ws.WebServiceContext;
@@ -68,4 +69,8 @@ public class BookStore implements BookStoreService {
final MessageContext ctx = context.getMessageContext();
ctx.put(MessageContext.HTTP_RESPONSE_CODE, 202);
}
+
+ @WebMethod @Oneway
+ public void orderBooks() {
+ }
}
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 5b5e43e071..653804a46e 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
@@ -256,6 +256,20 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
hasAttribute(SemanticAttributes.HTTP_STATUS_CODE, 202L));
}
+ @Test
+ public void testThatNewInnerSpanIsCreatedOneway() throws Exception {
+ final BookStoreService service = createJaxWsService(new OpenTelemetryClientFeature(otelRule
+ .getOpenTelemetry(), "jaxws-client-test"));
+ service.orderBooks();
+
+ // Await till flush happens, usually every second
+ await().atMost(Duration.ofSeconds(1L)).until(() -> otelRule.getSpans().size() == 2);
+
+ assertThat(otelRule.getSpans().get(0).getName(), equalTo("POST /BookStore"));
+ assertThat(otelRule.getSpans().get(1).getName(),
+ equalTo("POST http://localhost:" + PORT + "/BookStore"));
+ }
+
private BookStoreService createJaxWsService(final Feature feature) {
return createJaxWsService(Collections.emptyMap(), feature);
}
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/BookStore.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/BookStore.java
index 5ffa70ed6e..874ed76685 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/BookStore.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/BookStore.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.UUID;
import javax.annotation.Resource;
+import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.xml.ws.WebServiceContext;
@@ -65,6 +66,10 @@ public class BookStore implements BookStoreService {
throw new RuntimeException("Unable to remove books");
}
+ @WebMethod @Oneway
+ public void orderBooks() {
+ }
+
@WebMethod
public void addBooks() {
final MessageContext ctx = context.getMessageContext();
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
index af8268924d..481c961628 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java
@@ -229,6 +229,19 @@ public class OpenTracingTracingTest extends AbstractClientServerTestBase {
assertThat(REPORTER.getSpans().get(0).getTags(), hasItem(Tags.HTTP_STATUS.getKey(), 202));
}
+ @Test
+ public void testThatNewInnerSpanIsCreatedOneway() throws Exception {
+ final BookStoreService service = createJaxWsService(new OpenTracingClientFeature(tracer));
+ service.orderBooks();
+
+ // Await till flush happens, usually every second
+ await().atMost(Duration.ofSeconds(1L)).until(() -> REPORTER.getSpans().size() == 2);
+
+ assertThat(REPORTER.getSpans().get(0).getOperationName(), equalTo("POST /BookStore"));
+ assertThat(REPORTER.getSpans().get(1).getOperationName(),
+ equalTo("POST http://localhost:" + PORT + "/BookStore"));
+ }
+
private static BookStoreService createJaxWsService() {
return createJaxWsService(Collections.emptyMap());
}
[cxf] 02/03: Bump cxf.opentelemetry.version from 1.30.1 to 1.31.0 (#1463)
Posted by re...@apache.org.
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] <49...@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] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@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;