Replace deprecated OpenTelemetry semantic convention attributes

apache · Oct 17, 2023 · d17fe34 · d17fe34
1 parent ef7d989
commit d17fe34
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/...c/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java b/...c/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java
@@ -59,8 +59,8 @@ protected TraceScopeHolder<TraceScope> startTraceSpan(final Map<String, List<Str
         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 @@ protected void stopTraceSpan(final TraceScopeHolder<TraceScope> holder, final in
                 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/...try/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java b/...try/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java
@@ -63,8 +63,8 @@ protected TraceScopeHolder<TraceScope> startTraceSpan(final Map<String, List<Str
 
         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 @@ protected void stopTraceSpan(final Map<String, List<String>> requestHeaders,
                 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/...est/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java b/...est/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java
@@ -125,7 +125,7 @@ public void testThatNewSpanIsCreatedWhenNotProvided() {
         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 void testThatErrorSpanIsCreatedOnExceptionWhenNotProvided() {
         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 void testThatErrorSpanIsCreatedOnErrorWhenNotProvided() {
         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 void testThatErrorSpanIsCreatedOnMappedExceptionWhenNotProvided() {
         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/...est/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java b/...est/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java
@@ -237,7 +237,7 @@ public void testThatNewChildSpanIsCreatedWhenParentIsProvidedInCaseOfFault() thr
         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 void testThatNewChildSpanIsCreatedWhenParentIsProvidedAndCustomStatusCode
         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