Tie in SpannerExceptionFactory.propagateInterrupt

Author: odeke-em

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

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

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

@@ -81,8 +81,14 @@ public static SpannerException newSpannerException(
   }
 
   public static SpannerException propagateInterrupt(InterruptedException e) {
+    return propagateInterrupt(e, null);
+  }
+
+  public static SpannerException propagateInterrupt(
+      InterruptedException e, XGoogSpannerRequestId reqId) {
     Thread.currentThread().interrupt();
-    return SpannerExceptionFactory.newSpannerException(ErrorCode.CANCELLED, "Interrupted", e);
+    return SpannerExceptionFactory.newSpannerException(
+        ErrorCode.CANCELLED, "Interrupted", e, reqId);
   }
 
   /**