Store bytes in HTTP Responses to allow for subsequent reads

open-telemetry · Aug 27, 2024 · 039ca4c · 039ca4c
1 parent 3ad57cf
commit 039ca4c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/...va/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java b/...va/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java
@@ -625,8 +625,15 @@ void error() {
             ex -> {
               assertThat(ex.getResponse())
                   .isNotNull()
-                  .extracting(HttpSender.Response::statusCode)
-                  .isEqualTo(statusCode);
+                  .satisfies(
+                      response -> {
+                        assertThat(response)
+                            .extracting(HttpSender.Response::statusCode)
+                            .isEqualTo(statusCode);
+
+                        assertThatCode(response::responseBody).doesNotThrowAnyException();
+                      });
+
               assertThat(ex.getCause()).isNull();
             });
 

diff --git a/...http/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java b/...http/src/main/java/io/opentelemetry/exporter/sender/okhttp/internal/OkHttpHttpSender.java
@@ -143,6 +143,8 @@ public void onResponse(Call call, okhttp3.Response response) {
                         try (ResponseBody body = response.body()) {
                           onResponse.accept(
                               new Response() {
+                                @Nullable private byte[] bodyBytes;
+
                                 @Override
                                 public int statusCode() {
                                   return response.code();
@@ -155,7 +157,10 @@ public String statusMessage() {
 
                                 @Override
                                 public byte[] responseBody() throws IOException {
-                                  return body.bytes();
+                                  if (bodyBytes == null) {
+                                    bodyBytes = body.bytes();
+                                  }
+                                  return bodyBytes;
                                 }
                               });
                         }