Merge pull request #1144 from microsoft/dependabot/gradle/components/http/okHttp/android/io.opentelemetry.semconv-opentelemetry-semconv-1.24.0-alpha

Bump io.opentelemetry.semconv:opentelemetry-semconv from 1.23.1-alpha to 1.24.0-alpha in /components/http/okHttp/android

Author: github-actions[bot]

components/http/okHttp/gradle/dependencies.gradle

@@ -11,7 +11,8 @@ dependencies {
     // This dependency is used internally, and not exposed to consumers on their own compile classpath.
     implementation 'io.opentelemetry:opentelemetry-api:1.36.0'
     implementation 'io.opentelemetry:opentelemetry-context:1.36.0'
-    implementation 'io.opentelemetry.semconv:opentelemetry-semconv:1.23.1-alpha'
+    implementation 'io.opentelemetry.semconv:opentelemetry-semconv:1.24.0-alpha'
+    implementation 'io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.24.0-alpha'
     implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
     api 'com.squareup.okhttp3:okhttp:4.12.0'
 

components/http/okHttp/src/main/java/com/microsoft/kiota/http/OkHttpRequestAdapter.java

@@ -19,7 +19,11 @@
 import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.semconv.SemanticAttributes;
+import io.opentelemetry.semconv.HttpAttributes;
+import io.opentelemetry.semconv.NetworkAttributes;
+import io.opentelemetry.semconv.ServerAttributes;
+import io.opentelemetry.semconv.UrlAttributes;
+import io.opentelemetry.semconv.incubating.HttpIncubatingAttributes;
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
@@ -720,17 +724,18 @@ private Response getHttpResponseMessage(
                 final int contentLengthHeaderValueAsInt =
                         Integer.parseInt(contentLengthHeaderValue);
                 spanForAttributes.setAttribute(
-                        SemanticAttributes.HTTP_RESPONSE_BODY_SIZE, contentLengthHeaderValueAsInt);
+                        HttpIncubatingAttributes.HTTP_RESPONSE_BODY_SIZE,
+                        contentLengthHeaderValueAsInt);
             }
             final String contentTypeHeaderValue = getHeaderValue(response, "Content-Length");
             if (contentTypeHeaderValue != null && !contentTypeHeaderValue.isEmpty()) {
                 spanForAttributes.setAttribute(
                         "http.response_content_type", contentTypeHeaderValue);
             }
             spanForAttributes.setAttribute(
-                    SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, response.code());
+                    HttpAttributes.HTTP_RESPONSE_STATUS_CODE, response.code());
             spanForAttributes.setAttribute(
-                    SemanticAttributes.NETWORK_PROTOCOL_VERSION,
+                    NetworkAttributes.NETWORK_PROTOCOL_VERSION,
                     response.protocol().toString().toUpperCase(Locale.ROOT));
             return this.retryCAEResponseIfRequired(
                     response, requestInfo, span, spanForAttributes, claims);
@@ -786,7 +791,7 @@ private Response retryCAEResponseIfRequired(
                 }
                 closeResponse(true, response);
                 span.addEvent(authenticateChallengedEventKey);
-                spanForAttributes.setAttribute(SemanticAttributes.HTTP_RESEND_COUNT, 1);
+                spanForAttributes.setAttribute(HttpAttributes.HTTP_REQUEST_RESEND_COUNT, 1);
                 return this.getHttpResponseMessage(
                         requestInfo, span, spanForAttributes, responseClaims);
             }
@@ -871,14 +876,14 @@ private void setBaseUrlForRequestInformation(@Nonnull final RequestInformation r
                         .startSpan();
         try (final Scope scope = span.makeCurrent()) {
             spanForAttributes.setAttribute(
-                    SemanticAttributes.HTTP_REQUEST_METHOD, requestInfo.httpMethod.toString());
+                    HttpAttributes.HTTP_REQUEST_METHOD, requestInfo.httpMethod.toString());
             final URL requestURL = requestInfo.getUri().toURL();
             if (obsOptions.getIncludeEUIIAttributes()) {
-                spanForAttributes.setAttribute(SemanticAttributes.URL_FULL, requestURL.toString());
+                spanForAttributes.setAttribute(UrlAttributes.URL_FULL, requestURL.toString());
             }
             spanForAttributes.setAttribute("http.port", requestURL.getPort());
-            spanForAttributes.setAttribute(SemanticAttributes.SERVER_ADDRESS, requestURL.getHost());
-            spanForAttributes.setAttribute(SemanticAttributes.URL_SCHEME, requestURL.getProtocol());
+            spanForAttributes.setAttribute(ServerAttributes.SERVER_ADDRESS, requestURL.getHost());
+            spanForAttributes.setAttribute(UrlAttributes.URL_SCHEME, requestURL.getProtocol());
 
             RequestBody body =
                     requestInfo.content == null
@@ -922,7 +927,8 @@ public long contentLength() throws IOException {
                                     }
                                     if (length > 0) {
                                         spanForAttributes.setAttribute(
-                                                SemanticAttributes.HTTP_REQUEST_BODY_SIZE, length);
+                                                HttpIncubatingAttributes.HTTP_REQUEST_BODY_SIZE,
+                                                length);
                                     }
                                     return length;
                                 }