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
commit d17fe348a8153db12508c5efe274d262a7b4d83f Author: Andriy Redko <[email protected]> AuthorDate: Mon Oct 16 20:57:48 2023 -0400 Replace deprecated OpenTelemetry semantic convention attributes --- .../opentelemetry/AbstractOpenTelemetryClientProvider.java | 6 +++--- .../cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java | 6 +++--- .../jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java | 8 ++++---- .../jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) 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 d2e5717eb6..52cfd7e893 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 @@ -59,8 +59,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_METHOD, method) - .setAttribute(SemanticAttributes.HTTP_URL, uri.toString()) + .setAttribute(SemanticAttributes.HTTP_REQUEST_METHOD, method) + .setAttribute(SemanticAttributes.URL_FULL, uri.toString()) // TODO: Enhance with semantics from request .startSpan(); Scope scope = activeSpan.makeCurrent(); @@ -100,7 +100,7 @@ public abstract class AbstractOpenTelemetryClientProvider extends AbstractTracin scope = span.makeCurrent(); } - span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE.getKey(), responseStatus); + span.setAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE.getKey(), responseStatus); 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 d8ddda3e8d..b23d47537a 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 @@ -63,8 +63,8 @@ public abstract class AbstractOpenTelemetryProvider extends AbstractTracingProvi SpanBuilder spanBuilder = tracer.spanBuilder(buildSpanDescription(uri.getPath(), method)) .setSpanKind(SpanKind.SERVER) - .setAttribute(SemanticAttributes.HTTP_METHOD, method) - .setAttribute(SemanticAttributes.HTTP_URL, uri.toString()); + .setAttribute(SemanticAttributes.HTTP_REQUEST_METHOD, method) + .setAttribute(SemanticAttributes.URL_FULL, uri.toString()); Span activeSpan = spanBuilder.startSpan(); Scope scope = activeSpan.makeCurrent(); @@ -104,7 +104,7 @@ public abstract class AbstractOpenTelemetryProvider extends AbstractTracingProvi scope = span.makeCurrent(); } - span.setAttribute(SemanticAttributes.HTTP_STATUS_CODE, responseStatus); + span.setAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, responseStatus); span.end(); scope.close(); 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 7e0cb0f6ed..87e6dc32f0 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 @@ -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_STATUS_CODE, 200L)); + hasAttribute(SemanticAttributes.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_STATUS_CODE, 500L)); + hasAttribute(SemanticAttributes.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_STATUS_CODE, 503L)); + hasAttribute(SemanticAttributes.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_STATUS_CODE, 404L)); + hasAttribute(SemanticAttributes.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 ea416f66e4..1df8584b64 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 @@ -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_STATUS_CODE, 500L)); + hasAttribute(SemanticAttributes.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_STATUS_CODE, 202L)); + hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 202L)); } @Test
