More newSpannerException updates

Author: odeke-em

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

@@ -180,10 +180,10 @@ private void backoffSleep(Context context, long backoffMillis) throws SpannerExc
       }
       if (latch.await(backoffMillis, TimeUnit.MILLISECONDS)) {
         // Woken by context cancellation.
-        throw newSpannerExceptionForCancellation(context, null);
+        throw newSpannerExceptionForCancellation(context, null, null /*TODO: requestId*/);
       }
     } catch (InterruptedException interruptExcept) {
-      throw newSpannerExceptionForCancellation(context, interruptExcept);
+      throw newSpannerExceptionForCancellation(context, interruptExcept, null /*TODO: requestId*/);
     } finally {
       context.removeListener(listener);
     }

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

@@ -37,7 +37,8 @@ public static <T> T getOrNull(ApiFuture<T> future) throws SpannerException {
     } catch (InterruptedException e) {
       throw SpannerExceptionFactory.propagateInterrupt(e);
     } catch (CancellationException e) {
-      throw SpannerExceptionFactory.newSpannerExceptionForCancellation(null, e);
+      throw SpannerExceptionFactory.newSpannerExceptionForCancellation(
+          null, e, null /*TODO: requestId*/);
     }
   }
 }

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

@@ -25,8 +25,9 @@ public class SpannerBatchUpdateException extends SpannerException {
       ErrorCode code,
       String message,
       long[] counts,
-      Throwable cause) {
-    super(token, code, false, message, cause);
+      Throwable cause,
+      XGoogSpannerRequestId reqId) {
+    super(token, code, false, message, cause, null, reqId);
     updateCounts = counts;
   }
 

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

@@ -118,22 +118,23 @@ public static SpannerException asSpannerException(Throwable t) {
    * #newSpannerException(ErrorCode, String)} instead of this method.
    */
   public static SpannerException newSpannerException(Throwable cause) {
-    return newSpannerException(null, cause);
+    return newSpannerException(null, cause, null);
   }
 
   public static SpannerException newSpannerException(
       Throwable cause, XGoogSpannerRequestId requestId) {
-    return newSpannerExceptionPreformatted(null, null, cause, null, requestId);
+    return newSpannerException(null, cause, requestId);
   }
 
   public static SpannerBatchUpdateException newSpannerBatchUpdateException(
-      ErrorCode code, String message, long[] updateCounts) {
+      ErrorCode code, String message, long[] updateCounts, @Nullable XGoogSpannerRequestId reqId) {
     DoNotConstructDirectly token = DoNotConstructDirectly.ALLOWED;
     SpannerException cause = null;
     if (isTransactionMutationLimitException(code, message)) {
-      cause = new TransactionMutationLimitExceededException(token, code, message, null, null, null);
+      cause =
+          new TransactionMutationLimitExceededException(token, code, message, null, null, reqId);
     }
-    return new SpannerBatchUpdateException(token, code, message, updateCounts, cause);
+    return new SpannerBatchUpdateException(token, code, message, updateCounts, cause, reqId);
   }
 
   /** Constructs a specific error that */
@@ -191,21 +192,22 @@ public static SpannerBatchUpdateException newSpannerBatchUpdateException(
    * <p>Intended for internal library use; user code should use {@link
    * #newSpannerException(ErrorCode, String)} instead of this method.
    */
-  public static SpannerException newSpannerException(@Nullable Context context, Throwable cause) {
+  public static SpannerException newSpannerException(
+      @Nullable Context context, Throwable cause, @Nullable XGoogSpannerRequestId reqId) {
     if (cause instanceof SpannerException) {
       SpannerException e = (SpannerException) cause;
-      return newSpannerExceptionPreformatted(e.getErrorCode(), e.getMessage(), e);
+      return newSpannerExceptionPreformatted(e.getErrorCode(), e.getMessage(), e, null, reqId);
     } else if (cause instanceof CancellationException) {
-      return newSpannerExceptionForCancellation(context, cause);
+      return newSpannerExceptionForCancellation(context, cause, reqId);
     } else if (cause instanceof ApiException) {
-      return fromApiException((ApiException) cause);
+      return fromApiException((ApiException) cause, reqId);
     }
     // Extract gRPC status.  This will produce "UNKNOWN" for non-gRPC exceptions.
     Status status = Status.fromThrowable(cause);
     if (status.getCode() == Status.Code.CANCELLED) {
-      return newSpannerExceptionForCancellation(context, cause);
+      return newSpannerExceptionForCancellation(context, cause, reqId);
     }
-    return newSpannerException(ErrorCode.fromGrpcStatus(status), cause.getMessage(), cause);
+    return newSpannerException(ErrorCode.fromGrpcStatus(status), cause.getMessage(), cause, reqId);
   }
 
   public static RuntimeException causeAsRunTimeException(ExecutionException executionException) {
@@ -229,7 +231,7 @@ static SpannerException newRetryOnDifferentGrpcChannelException(
   }
 
   static SpannerException newSpannerExceptionForCancellation(
-      @Nullable Context context, @Nullable Throwable cause) {
+      @Nullable Context context, @Nullable Throwable cause, @Nullable XGoogSpannerRequestId reqId) {
     if (context != null && context.isCancelled()) {
       Throwable cancellationCause = context.cancellationCause();
       Throwable throwable =
@@ -238,9 +240,10 @@ static SpannerException newSpannerExceptionForCancellation(
               : MoreObjects.firstNonNull(cause, cancellationCause);
       if (cancellationCause instanceof TimeoutException) {
         return newSpannerException(
-            ErrorCode.DEADLINE_EXCEEDED, "Current context exceeded deadline", throwable);
+            ErrorCode.DEADLINE_EXCEEDED, "Current context exceeded deadline", throwable, reqId);
       } else {
-        return newSpannerException(ErrorCode.CANCELLED, "Current context was cancelled", throwable);
+        return newSpannerException(
+            ErrorCode.CANCELLED, "Current context was cancelled", throwable, reqId);
       }
     }
     return newSpannerException(
@@ -371,7 +374,8 @@ static SpannerException newSpannerExceptionPreformatted(
         code, message, cause, null, (XGoogSpannerRequestId) (null));
   }
 
-  private static SpannerException fromApiException(ApiException exception) {
+  private static SpannerException fromApiException(
+      ApiException exception, @Nullable XGoogSpannerRequestId reqId) {
     Status.Code code;
     if (exception.getStatusCode() instanceof GrpcStatusCode) {
       code = ((GrpcStatusCode) exception.getStatusCode()).getTransportCode();
@@ -387,7 +391,7 @@ private static SpannerException fromApiException(ApiException exception) {
         formatMessage(errorCode, exception.getMessage()),
         exception.getCause(),
         exception,
-        null);
+        reqId);
   }
 
   private static boolean isRetryable(ErrorCode code, @Nullable Throwable cause) {

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

@@ -120,7 +120,8 @@ public TimedAttemptSettings createNextAttempt(
     public boolean shouldRetry(Throwable prevThrowable, T prevResponse)
         throws CancellationException {
       if (Context.current().isCancelled()) {
-        throw SpannerExceptionFactory.newSpannerExceptionForCancellation(Context.current(), null);
+        throw SpannerExceptionFactory.newSpannerExceptionForCancellation(
+            Context.current(), null, null);
       }
       return prevThrowable instanceof AbortedException
           || prevThrowable instanceof com.google.api.gax.rpc.AbortedException;

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

@@ -685,7 +685,8 @@ options, getPreviousTransactionId())))
           }
           throw se;
         } catch (InterruptedException e) {
-          throw SpannerExceptionFactory.newSpannerExceptionForCancellation(null, e);
+          throw SpannerExceptionFactory.newSpannerExceptionForCancellation(
+              null, e, null /*TODO: requestId*/);
         }
       }
       // There is already a transactionId available. Include that id as the transaction to use.
@@ -1074,7 +1075,8 @@ public long[] batchUpdate(Iterable<Statement> statements, UpdateOption... update
             throw newSpannerBatchUpdateException(
                 ErrorCode.fromRpcStatus(response.getStatus()),
                 response.getStatus().getMessage(),
-                results);
+                results,
+                null /*TODO: requestId*/);
           }
           return results;
         } catch (Throwable e) {
@@ -1141,7 +1143,8 @@ public ApiFuture<long[]> batchUpdateAsync(
                     throw newSpannerBatchUpdateException(
                         ErrorCode.fromRpcStatus(batchDmlResponse.getStatus()),
                         batchDmlResponse.getStatus().getMessage(),
-                        results);
+                        results,
+                        null /*TODO: requestId*/);
                   }
                   return results;
                 },

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/DdlBatch.java

@@ -268,7 +268,7 @@ public ApiFuture<long[]> runBatchAsync(CallType callType) {
               } catch (SpannerException e) {
                 long[] updateCounts = extractUpdateCounts(operationReference.get());
                 throw SpannerExceptionFactory.newSpannerBatchUpdateException(
-                    e.getErrorCode(), e.getMessage(), updateCounts);
+                    e.getErrorCode(), e.getMessage(), updateCounts, null /* TODO: requestId */);
               }
             } catch (Throwable t) {
               span.setStatus(StatusCode.ERROR);

google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java

@@ -1974,7 +1974,7 @@ private static <T> T get(final Future<T> future) throws SpannerException {
       future.cancel(true);
       throw SpannerExceptionFactory.propagateInterrupt(e);
     } catch (Exception e) {
-      throw newSpannerException(context, e);
+      throw newSpannerException(context, e, null);
     }
   }