Merge remote-tracking branch 'origin/main' into CVE-2024-7254

Author: thugrock7

instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/apachehttpclient/v4_0/ApacheHttpClientUtils.java

@@ -19,6 +19,7 @@
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.javaagent.instrumentation.hypertrace.apachehttpclient.v4_0.ApacheHttpClientObjectRegistry.SpanAndAttributeKey;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -113,7 +114,10 @@ public static void traceEntity(
             && contentEncoding.getValue().toLowerCase().contains("gzip");
     if (entity.isRepeatable()) {
       try {
-        InputStream contentStream = entity.getContent();
+        BoundedByteArrayOutputStream byteArrayOutputStream =
+            BoundedBuffersFactory.createStream(charset);
+        entity.writeTo(byteArrayOutputStream);
+        InputStream contentStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
         if (isGzipEncoded) {
           try {
             contentStream = new GZIPInputStream(contentStream);

instrumentation/servlet/servlet-5.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/servlet/v5_0/Servlet50AndFilterInstrumentation.java

@@ -187,6 +187,9 @@ public static void exit(
 
         if (!request.isAsyncStarted()) {
           if (instrumentationConfig.httpHeaders().response()) {
+            if (throwable == null && !httpResponse.isCommitted()) {
+              httpResponse.flushBuffer();
+            }
             for (String headerName : httpResponse.getHeaderNames()) {
               String headerValue = httpResponse.getHeader(headerName);
               currentSpan.setAttribute(
@@ -216,6 +219,7 @@ public static void exit(
                 urlEncodedMapContextStore);
           }
         }
+      } catch (IOException ignored) {
       } finally {
         Throwable tmp = throwable;
         while (tmp != null) { // loop in case our exception is nested (eg. springframework)