add content type to vertx additional-data spans

hypertrace · Sep 25, 2023 · e37fc3a · e37fc3a
1 parent 40de66d
commit e37fc3a
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 6 deletions.
diff --git a/...opentelemetry/javaagent/instrumentation/hypertrace/vertx/ResponseBodyWrappingHandler.java b/...opentelemetry/javaagent/instrumentation/hypertrace/vertx/ResponseBodyWrappingHandler.java
@@ -17,11 +17,15 @@
 package io.opentelemetry.javaagent.instrumentation.hypertrace.vertx;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanBuilder;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
 import io.vertx.core.Handler;
 import io.vertx.core.buffer.Buffer;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
 
 public class ResponseBodyWrappingHandler implements Handler<Buffer> {
@@ -43,12 +47,30 @@ public void handle(Buffer event) {
     if (span.isRecording()) {
       span.setAttribute(HypertraceSemanticAttributes.HTTP_RESPONSE_BODY, responseBody);
     } else {
-      tracer
-          .spanBuilder(HypertraceSemanticAttributes.ADDITIONAL_DATA_SPAN_NAME)
-          .setParent(Context.root().with(span))
-          .setAttribute(HypertraceSemanticAttributes.HTTP_RESPONSE_BODY, responseBody)
-          .startSpan()
-          .end();
+      SpanBuilder spanBuilder =
+          tracer
+              .spanBuilder(HypertraceSemanticAttributes.ADDITIONAL_DATA_SPAN_NAME)
+              .setParent(Context.root().with(span))
+              .setAttribute(HypertraceSemanticAttributes.HTTP_RESPONSE_BODY, responseBody);
+
+      // Also add content type if present
+      if (span.getClass().getName().equals("io.opentelemetry.sdk.trace.SdkSpan")) {
+        try {
+          Method getAttribute =
+              span.getClass().getDeclaredMethod("getAttribute", AttributeKey.class);
+          getAttribute.setAccessible(true);
+          Object resContentType =
+              getAttribute.invoke(
+                  span, AttributeKey.stringKey("http.response.header.content-type"));
+          if (resContentType != null) {
+            spanBuilder.setAttribute("http.response.header.content-type", (String) resContentType);
+          }
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+          // ignore and continue
+        }
+      }
+
+      spanBuilder.startSpan().end();
     }
 
     wrapped.handle(event);

diff --git a/...ing-common/src/testFixtures/java/org/hypertrace/agent/testing/AbstractHttpClientTest.java b/...ing-common/src/testFixtures/java/org/hypertrace/agent/testing/AbstractHttpClientTest.java
@@ -16,6 +16,7 @@
 
 package org.hypertrace.agent.testing;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -118,6 +119,10 @@ public void postJson_echo()
       Assertions.assertEquals(2, traces.get(0).size());
       SpanData responseBodySpan = traces.get(0).get(1);
       assertBodies(clientSpan, responseBodySpan, body, body);
+      Assertions.assertNotNull(
+          responseBodySpan
+              .getAttributes()
+              .get(AttributeKey.stringKey("http.response.header.content-type")));
     } else {
       Assertions.assertEquals(1, traces.get(0).size());
       assertRequestAndResponseBody(clientSpan, body, body);