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 2024/03/29 21:21:42 UTC
(cxf) branch main updated: Bump io.opentelemetry.semconv:opentelemetry-semconv (#1774)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 249e42e88f Bump io.opentelemetry.semconv:opentelemetry-semconv (#1774)
249e42e88f is described below
commit 249e42e88f3fb73c1a64ecc433fbbb0920a8f6f0
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Mar 29 17:21:37 2024 -0400
Bump io.opentelemetry.semconv:opentelemetry-semconv (#1774)
Bumps [io.opentelemetry.semconv:opentelemetry-semconv](https://github.com/open-telemetry/semantic-conventions-java) from 1.23.1-alpha to 1.24.0-alpha.
- [Release notes](https://github.com/open-telemetry/semantic-conventions-java/releases)
- [Changelog](https://github.com/open-telemetry/semantic-conventions-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/semantic-conventions-java/commits)
---
updated-dependencies:
- dependency-name: io.opentelemetry.semconv:opentelemetry-semconv
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>
---
distribution/javadoc/pom.xml | 4 ++++
.../main/release/samples/jax_rs/tracing_micrometer/pom.xml | 4 ++++
.../src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java | 4 ++--
.../release/samples/jax_rs/tracing_opentelemetry/pom.xml | 4 ++++
.../src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java | 4 ++--
.../samples/jax_rs/tracing_opentelemetry_camel/pom.xml | 4 ++++
integration/tracing/tracing-opentelemetry/pom.xml | 4 ++++
.../opentelemetry/AbstractOpenTelemetryClientProvider.java | 12 +++++++-----
.../tracing/opentelemetry/AbstractOpenTelemetryProvider.java | 9 +++++----
parent/pom.xml | 7 ++++++-
.../tracing/opentelemetry/OpenTelemetryTracingTest.java | 10 +++++-----
.../tracing/opentelemetry/OpenTelemetryTracingTest.java | 6 +++---
12 files changed, 50 insertions(+), 22 deletions(-)
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 7ce5e0e57b..029df91f7d 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -395,6 +395,10 @@
<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.opentracing</groupId>
<artifactId>opentracing-util</artifactId>
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 5b4384f6b5..51bc5466da 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
@@ -154,5 +154,9 @@
<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 3d7eb6aad0..14f8bcfd80 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.ResourceAttributes;
+import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
public class OpenTelemetrySetup {
public static OpenTelemetrySdk setup(String serviceName) {
final Resource resource = Resource.getDefault()
- .merge(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, serviceName)));
+ .merge(Resource.create(Attributes.of(ServiceIncubatingAttributes.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 b5aa96020d..05fd728182 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
@@ -154,6 +154,10 @@
<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/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 5e9fae4778..7f66981d5d 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,14 +27,14 @@ 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.ResourceAttributes;
+import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
import io.opentracing.util.GlobalTracer;
public class OpenTelemetrySetup {
public static OpenTelemetrySdk setup(String serviceName) {
Resource resource = Resource.getDefault()
- .merge(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, serviceName)));
+ .merge(Resource.create(Attributes.of(ServiceIncubatingAttributes.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_camel/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry_camel/pom.xml
index e218605bfe..e89a96bc70 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
@@ -219,6 +219,10 @@
<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 4bf9798458..683a29c346 100644
--- a/integration/tracing/tracing-opentelemetry/pom.xml
+++ b/integration/tracing/tracing-opentelemetry/pom.xml
@@ -81,6 +81,10 @@
<groupId>io.opentelemetry.semconv</groupId>
<artifactId>opentelemetry-semconv</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.opentelemetry.semconv</groupId>
+ <artifactId>opentelemetry-semconv-incubating</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
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 52cfd7e893..2ffde203b1 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,9 @@ 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.SemanticAttributes;
+import io.opentelemetry.semconv.HttpAttributes;
+import io.opentelemetry.semconv.UrlAttributes;
+import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes;
public abstract class AbstractOpenTelemetryClientProvider extends AbstractTracingProvider {
protected static final Logger LOG = LogUtils.getL7dLogger(AbstractOpenTelemetryClientProvider.class);
@@ -59,8 +61,8 @@ public abstract class AbstractOpenTelemetryClientProvider extends AbstractTracin
Context parentContext = Context.current();
Span activeSpan = tracer.spanBuilder(buildSpanDescription(uri.toString(), method))
.setParent(parentContext).setSpanKind(SpanKind.CLIENT)
- .setAttribute(SemanticAttributes.HTTP_REQUEST_METHOD, method)
- .setAttribute(SemanticAttributes.URL_FULL, uri.toString())
+ .setAttribute(HttpAttributes.HTTP_REQUEST_METHOD, method)
+ .setAttribute(UrlAttributes.URL_FULL, uri.toString())
// TODO: Enhance with semantics from request
.startSpan();
Scope scope = activeSpan.makeCurrent();
@@ -100,7 +102,7 @@ public abstract class AbstractOpenTelemetryClientProvider extends AbstractTracin
scope = span.makeCurrent();
}
- span.setAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE.getKey(), responseStatus);
+ span.setAttribute(HttpAttributes.HTTP_RESPONSE_STATUS_CODE.getKey(), responseStatus);
span.end();
@@ -126,7 +128,7 @@ public abstract class AbstractOpenTelemetryClientProvider extends AbstractTracin
span.setStatus(StatusCode.ERROR);
if (ex != null) {
- span.recordException(ex, Attributes.of(SemanticAttributes.EXCEPTION_ESCAPED, true));
+ span.recordException(ex, Attributes.of(ExceptionIncubatingAttributes.EXCEPTION_ESCAPED, true));
}
span.end();
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 b23d47537a..d9b7d6e2ce 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,8 @@ 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.SemanticAttributes;
+import io.opentelemetry.semconv.HttpAttributes;
+import io.opentelemetry.semconv.UrlAttributes;
public abstract class AbstractOpenTelemetryProvider extends AbstractTracingProvider {
protected static final Logger LOG = LogUtils.getL7dLogger(AbstractOpenTelemetryProvider.class);
@@ -63,8 +64,8 @@ public abstract class AbstractOpenTelemetryProvider extends AbstractTracingProvi
SpanBuilder spanBuilder = tracer.spanBuilder(buildSpanDescription(uri.getPath(), method))
.setSpanKind(SpanKind.SERVER)
- .setAttribute(SemanticAttributes.HTTP_REQUEST_METHOD, method)
- .setAttribute(SemanticAttributes.URL_FULL, uri.toString());
+ .setAttribute(HttpAttributes.HTTP_REQUEST_METHOD, method)
+ .setAttribute(UrlAttributes.URL_FULL, uri.toString());
Span activeSpan = spanBuilder.startSpan();
Scope scope = activeSpan.makeCurrent();
@@ -104,7 +105,7 @@ public abstract class AbstractOpenTelemetryProvider extends AbstractTracingProvi
scope = span.makeCurrent();
}
- span.setAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, responseStatus);
+ span.setAttribute(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, responseStatus);
span.end();
scope.close();
diff --git a/parent/pom.xml b/parent/pom.xml
index 223bee279c..2884a9ac10 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -192,7 +192,7 @@
<cxf.olingo.version>2.0.12</cxf.olingo.version>
<cxf.openjpa.version>3.2.2</cxf.openjpa.version>
<cxf.opentelemetry.version>1.34.1</cxf.opentelemetry.version>
- <cxf.opentelemetry.semconv.version>1.23.1-alpha</cxf.opentelemetry.semconv.version>
+ <cxf.opentelemetry.semconv.version>1.24.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>3.0.0</cxf.persistence-api.version>
@@ -1928,6 +1928,11 @@
<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>
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 87e6dc32f0..e2cc6278be 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
@@ -61,7 +61,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.SemanticAttributes;
+import io.opentelemetry.semconv.HttpAttributes;
import org.junit.After;
import org.junit.BeforeClass;
@@ -125,7 +125,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().get(0).getName(), equalTo("Get Books"));
assertThat(otelRule.getSpans().get(1).getName(), equalTo("GET /bookstore/books"));
assertThat(otelRule.getSpans().get(1).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L));
+ hasAttribute(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L));
assertThat(otelRule.getSpans().get(1).getInstrumentationScopeInfo().getName(),
equalTo("jaxrs-server-test"));
}
@@ -397,7 +397,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().toString(), otelRule.getSpans().size(), equalTo(1));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("GET /bookstore/books/exception"));
assertThat(otelRule.getSpans().get(0).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 500L));
+ hasAttribute(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 500L));
}
@Test
@@ -408,7 +408,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().toString(), otelRule.getSpans().size(), equalTo(1));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("GET /bookstore/books/error"));
assertThat(otelRule.getSpans().get(0).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 503L));
+ hasAttribute(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 503L));
}
@Test
@@ -419,7 +419,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().toString(), otelRule.getSpans().size(), equalTo(1));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("GET /bookstore/books/mapper"));
assertThat(otelRule.getSpans().get(0).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 404L));
+ hasAttribute(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 404L));
}
private WebClient withTrace(final WebClient client) {
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 1df8584b64..f3e500dcc1 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
@@ -52,7 +52,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.SemanticAttributes;
+import io.opentelemetry.semconv.HttpAttributes;
import org.junit.After;
import org.junit.BeforeClass;
@@ -237,7 +237,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().size(), equalTo(2));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("POST /BookStore"));
assertThat(otelRule.getSpans().get(0).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 500L));
+ hasAttribute(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 500L));
assertThat(otelRule.getSpans().get(1).getName(),
equalTo("POST http://localhost:" + PORT + "/BookStore"));
}
@@ -252,7 +252,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().size(), equalTo(1));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("POST /BookStore"));
assertThat(otelRule.getSpans().get(0).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 202L));
+ hasAttribute(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 202L));
}
@Test