chore: update ZeroCopyResponseMarshaller to no longer have its error message hard coded to ReadObject

BenWhitehead · BenWhitehead · commit 8beaa0353f51 · 2025-03-18T18:18:38.000-04:00
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageOptions.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/GrpcStorageOptions.java
@@ -97,6 +97,7 @@
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.MethodDescriptor;
 import io.grpc.Status;
+import io.grpc.StatusRuntimeException;
 import io.grpc.protobuf.ProtoUtils;
 import io.opentelemetry.api.OpenTelemetry;
 import java.io.Closeable;
@@ -1214,21 +1215,15 @@ public Response parse(InputStream stream) {
           cis.setSizeLimit(Integer.MAX_VALUE);
         }
       } catch (IOException e) {
-        throw Status.INTERNAL
-            .withDescription("Error parsing input stream for ReadObject")
-            .withCause(e)
-            .asRuntimeException();
+        throw createStatusRuntimeException(e);
       }
       if (cis != null) {
         // fast path (no memory copy)
         Response message;
         try {
           message = parseFrom(cis);
         } catch (InvalidProtocolBufferException ipbe) {
-          throw Status.INTERNAL
-              .withDescription("Invalid protobuf byte sequence for ReadObject")
-              .withCause(ipbe)
-              .asRuntimeException();
+          throw createStatusRuntimeException(ipbe);
         }
         unclosedStreams.put(message, stream);
         return message;
@@ -1238,6 +1233,18 @@ public Response parse(InputStream stream) {
       }
     }
 
+    private StatusRuntimeException createStatusRuntimeException(IOException e) {
+      String description = "";
+      Response messagePrototype = baseMarshaller.getMessagePrototype();
+      if (messagePrototype != null) {
+        description = "for " + messagePrototype.getClass().getSimpleName();
+      }
+      return Status.INTERNAL
+          .withDescription("Error parsing input stream" + description)
+          .withCause(e)
+          .asRuntimeException();
+    }
+
     private Response parseFrom(CodedInputStream stream) throws InvalidProtocolBufferException {
       Response message = parser.parseFrom(stream);
       try {
