Merge branch 'main' into merge_span_normalizer_into_grouper

Author: surajpuvvada

semantic-convention-utils/src/main/java/org/hypertrace/semantic/convention/utils/http/HttpSemanticConventionUtils.java

@@ -28,6 +28,7 @@
 import static org.hypertrace.core.span.constants.v1.Http.HTTP_REQUEST_X_FORWARDED_FOR_HEADER;
 import static org.hypertrace.core.span.constants.v1.Http.HTTP_RESPONSE_BODY_TRUNCATED;
 import static org.hypertrace.core.span.constants.v1.Http.HTTP_RESPONSE_CONTENT_LENGTH;
+import static org.hypertrace.core.span.constants.v1.Http.HTTP_RESPONSE_CONTENT_TYPE;
 import static org.hypertrace.core.span.constants.v1.Http.HTTP_RESPONSE_HEADER;
 import static org.hypertrace.core.span.constants.v1.Http.HTTP_RESPONSE_SIZE;
 import static org.hypertrace.core.span.constants.v1.Http.HTTP_RESPONSE_STATUS_CODE;
@@ -816,6 +817,12 @@ public static Optional<String> getHttpRequestContentType(Event event) {
             event, List.of(RawSpanConstants.getValue(HTTP_REQUEST_CONTENT_TYPE))));
   }
 
+  public static Optional<String> getHttpResponseContentType(Event event) {
+    return Optional.ofNullable(
+        SpanAttributeUtils.getFirstAvailableStringAttribute(
+            event, List.of(RawSpanConstants.getValue(HTTP_RESPONSE_CONTENT_TYPE))));
+  }
+
   public static boolean isHttpRequestCookie(String requestHeaderAttributeKey) {
     return requestHeaderAttributeKey.equals(REQUEST_COOKIE_HEADER_KEY);
   }

semantic-convention-utils/src/test/java/org/hypertrace/semantic/convention/utils/http/HttpSemanticConventionUtilsTest.java

@@ -28,6 +28,7 @@
 import static org.hypertrace.core.span.constants.v1.Http.HTTP_REQUEST_X_FORWARDED_FOR_HEADER;
 import static org.hypertrace.core.span.constants.v1.Http.HTTP_RESPONSE_BODY_TRUNCATED;
 import static org.hypertrace.core.span.constants.v1.Http.HTTP_RESPONSE_CONTENT_LENGTH;
+import static org.hypertrace.core.span.constants.v1.Http.HTTP_RESPONSE_CONTENT_TYPE;
 import static org.hypertrace.core.span.constants.v1.Http.HTTP_RESPONSE_SIZE;
 import static org.hypertrace.core.span.constants.v1.Http.HTTP_USER_AGENT_REQUEST_HEADER;
 import static org.hypertrace.core.span.constants.v1.Http.HTTP_USER_AGENT_WITH_DASH;
@@ -513,6 +514,16 @@ public void testGetHttpRequestContentType() {
         HttpSemanticConventionUtils.getHttpRequestContentType(event));
   }
 
+  @Test
+  public void testGetHttpResponseContentType() {
+    Event event =
+        createMockEventWithAttribute(
+            RawSpanConstants.getValue(HTTP_RESPONSE_CONTENT_TYPE), "application/text");
+    assertEquals(
+        Optional.of("application/text"),
+        HttpSemanticConventionUtils.getHttpResponseContentType(event));
+  }
+
   @Test
   public void testGetHttpRequestSize() {
     Event event = createMockEventWithAttribute(RawSpanConstants.getValue(HTTP_REQUEST_SIZE), "100");