chore(spanner): extract ErrorDetails from grpc-status-details-bin for raw gRPC exceptions

Author: sakthivelmanii

java-spanner/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerException.java

@@ -137,10 +137,21 @@ enum DoNotConstructDirectly {
    * retry delay.
    */
   public long getRetryDelayInMillis() {
-    return extractRetryDelay(this.getCause());
+    return extractRetryDelay(this, this.apiException);
   }
 
   static long extractRetryDelay(Throwable cause) {
+    return extractRetryDelay(cause, null);
+  }
+
+  static long extractRetryDelay(Throwable cause, @Nullable ApiException apiException) {
+    ErrorDetails details = SpannerExceptionFactory.extractErrorDetails(cause, apiException);
+    if (details != null && details.getRetryInfo() != null) {
+      RetryInfo retryInfo = details.getRetryInfo();
+      if (retryInfo.hasRetryDelay()) {
+        return Durations.toMillis(retryInfo.getRetryDelay());
+      }
+    }
     if (cause != null) {
       Metadata trailers = Status.trailersFromThrowable(cause);
       if (trailers != null && trailers.containsKey(KEY_RETRY_INFO)) {
@@ -227,7 +238,7 @@ public ErrorDetails getErrorDetails() {
     if (this.apiException != null) {
       return this.apiException.getErrorDetails();
     }
-    return null;
+    return SpannerExceptionFactory.extractErrorDetails(getCause(), null);
   }
 
   void setStatement(String statement) {

java-spanner/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java

@@ -26,6 +26,7 @@
 import com.google.cloud.spanner.SpannerException.DoNotConstructDirectly;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Predicate;
+import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.rpc.ErrorInfo;
 import com.google.rpc.ResourceInfo;
 import com.google.rpc.RetryInfo;
@@ -56,6 +57,8 @@ public final class SpannerExceptionFactory {
       ProtoUtils.keyForProto(ResourceInfo.getDefaultInstance());
   private static final Metadata.Key<ErrorInfo> KEY_ERROR_INFO =
       ProtoUtils.keyForProto(ErrorInfo.getDefaultInstance());
+  private static final Metadata.Key<byte[]> KEY_ERROR_DETAILS =
+      Metadata.Key.of("grpc-status-details-bin", Metadata.BINARY_BYTE_MARSHALLER);
 
   public static SpannerException newSpannerException(ErrorCode code, @Nullable String message) {
     return newSpannerException(code, message, null);
@@ -247,6 +250,10 @@ private static String formatMessage(ErrorCode code, @Nullable String message) {
   }
 
   private static ResourceInfo extractResourceInfo(Throwable cause) {
+    ErrorDetails details = extractErrorDetails(cause, null);
+    if (details != null && details.getResourceInfo() != null) {
+      return details.getResourceInfo();
+    }
     if (cause != null) {
       Metadata trailers = Status.trailersFromThrowable(cause);
       if (trailers != null) {
@@ -257,8 +264,9 @@ private static ResourceInfo extractResourceInfo(Throwable cause) {
   }
 
   private static ErrorInfo extractErrorInfo(Throwable cause, ApiException apiException) {
-    if (apiException != null && apiException.getErrorDetails() != null) {
-      return apiException.getErrorDetails().getErrorInfo();
+    ErrorDetails details = extractErrorDetails(cause, apiException);
+    if (details != null && details.getErrorInfo() != null) {
+      return details.getErrorInfo();
     }
     if (cause != null) {
       Metadata trailers = Status.trailersFromThrowable(cause);
@@ -277,10 +285,26 @@ static ErrorDetails extractErrorDetails(Throwable cause, ApiException apiExcepti
     Throwable prevCause = null;
     while (cause != null && cause != prevCause) {
       if (cause instanceof ApiException) {
-        return ((ApiException) cause).getErrorDetails();
+        if (((ApiException) cause).getErrorDetails() != null) {
+          return ((ApiException) cause).getErrorDetails();
+        }
       }
       if (cause instanceof SpannerException) {
-        return ((SpannerException) cause).getErrorDetails();
+        if (((SpannerException) cause).getErrorDetails() != null) {
+          return ((SpannerException) cause).getErrorDetails();
+        }
+      }
+      Metadata trailers = Status.trailersFromThrowable(cause);
+      if (trailers != null) {
+        byte[] bytes = trailers.get(KEY_ERROR_DETAILS);
+        if (bytes != null) {
+          try {
+            com.google.rpc.Status status = com.google.rpc.Status.parseFrom(bytes);
+            return ErrorDetails.builder().setRawErrorMessages(status.getDetailsList()).build();
+          } catch (InvalidProtocolBufferException e) {
+            // ignore and continue
+          }
+        }
       }
       prevCause = cause;
       cause = cause.getCause();

java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerExceptionFactoryTest.java

@@ -251,4 +251,29 @@ private Metadata createResourceTypeMetadata(String resourceType, String resource
 
     return trailers;
   }
+
+  @Test
+  public void resourceExhaustedWithGrpcStatusDetails() {
+    Status status =
+        Status.fromCodeValue(Status.Code.RESOURCE_EXHAUSTED.value())
+            .withDescription("Memory pushback");
+    Metadata trailers = new Metadata();
+    Metadata.Key<byte[]> key =
+        Metadata.Key.of("grpc-status-details-bin", Metadata.BINARY_BYTE_MARSHALLER);
+    RetryInfo retryInfo =
+        RetryInfo.newBuilder()
+            .setRetryDelay(Duration.newBuilder().setNanos(1000000).setSeconds(1L))
+            .build();
+    com.google.rpc.Status rpcStatus =
+        com.google.rpc.Status.newBuilder()
+            .setCode(com.google.rpc.Code.RESOURCE_EXHAUSTED_VALUE)
+            .setMessage("Memory pushback")
+            .addDetails(com.google.protobuf.Any.pack(retryInfo))
+            .build();
+    trailers.put(key, rpcStatus.toByteArray());
+    SpannerException e =
+        SpannerExceptionFactory.newSpannerException(new StatusRuntimeException(status, trailers));
+    assertThat(e.isRetryable()).isTrue();
+    assertThat(e.getRetryDelayInMillis()).isEqualTo(1001);
+  }
 }