Apply allOptions copy everywhere

Author: odeke-em

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

@@ -440,9 +440,13 @@ private TransactionOption[] withReqId(
     if (reqId == null) {
       return options;
     }
-    ArrayList<TransactionOption> allOptions = new ArrayList(Arrays.asList(options));
-    allOptions.add(new Options.RequestIdOption(reqId));
-    return allOptions.toArray(new TransactionOption[0]);
+    if (options == null || options.length == 0) {
+      return new TransactionOption[] {new Options.RequestIdOption(reqId)};
+    }
+    TransactionOption[] allOptions = new TransactionOption[options.length + 1];
+    System.arraycopy(options, 0, allOptions, 0, options.length);
+    allOptions[options.length] = new Options.RequestIdOption(reqId);
+    return allOptions;
   }
 
   private long executePartitionedUpdateWithPooledSession(

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

@@ -126,7 +126,7 @@ interface SessionTransaction {
   private final Clock clock;
   private final Map<SpannerRpc.Option, ?> options;
   private final ErrorHandler errorHandler;
-  private final XGoogSpannerRequestId.RequestIdCreator requestIdCreator;
+  private XGoogSpannerRequestId.RequestIdCreator requestIdCreator;
 
   SessionImpl(SpannerImpl spanner, SessionReference sessionReference) {
     this(spanner, sessionReference, NO_CHANNEL_HINT);

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

@@ -2052,10 +2052,7 @@ <ReqT, RespT> GrpcCallContext newCallContext(
           context = context.withChannelAffinity(affinity.intValue());
         }
       }
-      if (method != null) {
-        String methodName = method.getFullMethodName();
-        context = withRequestId(context, options);
-      }
+      context = withRequestId(context, options);
     }
     context = context.withExtraHeaders(metadataProvider.newExtraHeaders(resource, projectName));
     if (routeToLeader && leaderAwareRoutingEnabled) {