Get more tests reveal needs for plumbing

Author: odeke-em

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

@@ -929,9 +929,12 @@ private ResultSet internalExecuteUpdate(
       final ExecuteSqlRequest.Builder builder =
           getExecuteSqlRequestBuilder(
               statement, queryMode, options, /* withTransactionSelector= */ true);
+      XGoogSpannerRequestId reqId =
+          session.getRequestIdCreator().nextRequestId(1 /*TODO: channelId */, 1);
       try {
         com.google.spanner.v1.ResultSet resultSet =
-            rpc.executeQuery(builder.build(), getTransactionChannelHint(), isRouteToLeader());
+            rpc.executeQuery(
+                builder.build(), reqId.withOptions(getTransactionChannelHint()), isRouteToLeader());
         session.markUsed(clock.instant());
         if (resultSet.getMetadata().hasTransaction()) {
           onTransactionMetadata(

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

@@ -229,18 +229,22 @@ public static void startStaticServer() throws IOException {
         new HashSet(
             Arrays.asList(
                 "google.spanner.v1.Spanner/BatchCreateSessions",
-                // As functionality is added, uncomment each method.
                 "google.spanner.v1.Spanner/BatchWrite",
                 "google.spanner.v1.Spanner/BeginTransaction",
+                "google.spanner.v1.Spanner/Commit",
                 "google.spanner.v1.Spanner/CreateSession",
                 "google.spanner.v1.Spanner/DeleteSession",
                 "google.spanner.v1.Spanner/ExecuteBatchDml",
                 "google.spanner.v1.Spanner/ExecuteSql",
                 "google.spanner.v1.Spanner/ExecuteStreamingSql",
-                "google.spanner.v1.Spanner/StreamingRead",
-                "google.spanner.v1.Spanner/PartitionQuery",
-                "google.spanner.v1.Spanner/PartitionRead",
-                "google.spanner.v1.Spanner/Commit"));
+                "google.spanner.v1.Spanner/GetSession",
+                "google.spanner.v1.Spanner/ListSessions",
+                // TODO: Uncomment the methods when the implementation is completed.
+                // "google.spanner.v1.Spanner/PartitionQuery",
+                // "google.spanner.v1.Spanner/PartitionRead",
+                "google.spanner.v1.Spanner/Read",
+                "google.spanner.v1.Spanner/Rollback",
+                "google.spanner.v1.Spanner/StreamingRead"));
     xGoogReqIdInterceptor = new XGoogSpannerRequestIdTest.ServerHeaderEnforcer(checkMethods);
     executor = Executors.newSingleThreadExecutor();
     String uniqueName = InProcessServerBuilder.generateName();

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

@@ -1481,6 +1481,8 @@ public void testSessionNotFoundReadWriteTransaction() {
       when(closedSession.getName())
           .thenReturn("projects/dummy/instances/dummy/database/dummy/sessions/session-closed");
       when(closedSession.getErrorHandler()).thenReturn(DefaultErrorHandler.INSTANCE);
+      when(closedSession.getRequestIdCreator())
+          .thenReturn(new XGoogSpannerRequestId.NoopRequestIdCreator());
 
       Span oTspan = mock(Span.class);
       ISpan span = new OpenTelemetrySpan(oTspan);
@@ -1521,6 +1523,8 @@ public void testSessionNotFoundReadWriteTransaction() {
       TransactionRunnerImpl openTransactionRunner = new TransactionRunnerImpl(openSession);
       openTransactionRunner.setSpan(span);
       when(openSession.readWriteTransaction()).thenReturn(openTransactionRunner);
+      when(openSession.getRequestIdCreator())
+          .thenReturn(new XGoogSpannerRequestId.NoopRequestIdCreator());
 
       ResultSet openResultSet = mock(ResultSet.class);
       when(openResultSet.next()).thenReturn(true, false);

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

@@ -67,6 +67,8 @@ public void setup() {
                     .setCommitTimestamp(Timestamp.newBuilder().setSeconds(99L).setNanos(10).build())
                     .build()));
     when(session.getName()).thenReturn("test");
+    when(session.getRequestIdCreator())
+        .thenReturn(new XGoogSpannerRequestId.NoopRequestIdCreator());
     doNothing().when(span).setStatus(any(Throwable.class));
     doNothing().when(span).end();
     doNothing().when(span).addAnnotation("Starting Commit");
@@ -210,6 +212,8 @@ public void testReturnCommitStats() {
   private void batchDml(int status) {
     SessionImpl session = mock(SessionImpl.class);
     when(session.getName()).thenReturn("test");
+    when(session.getRequestIdCreator())
+        .thenReturn(new XGoogSpannerRequestId.NoopRequestIdCreator());
     SpannerRpc rpc = mock(SpannerRpc.class);
     ExecuteBatchDmlResponse response =
         ExecuteBatchDmlResponse.newBuilder()

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

@@ -121,6 +121,8 @@ public void setUp() {
     when(session.getErrorHandler()).thenReturn(DefaultErrorHandler.INSTANCE);
     when(session.newTransaction(eq(Options.fromTransactionOptions()), any())).thenReturn(txn);
     when(session.getTracer()).thenReturn(tracer);
+    when(session.getRequestIdCreator())
+        .thenReturn(new XGoogSpannerRequestId.NoopRequestIdCreator());
     when(rpc.executeQuery(Mockito.any(ExecuteSqlRequest.class), Mockito.anyMap(), eq(true)))
         .thenAnswer(
             invocation -> {
@@ -334,6 +336,7 @@ public void inlineBegin() {
             spanner,
             new SessionReference(
                 "projects/p/instances/i/databases/d/sessions/s", Collections.EMPTY_MAP)) {};
+    session.setRequestIdCreator(new XGoogSpannerRequestId.NoopRequestIdCreator());
     session.setCurrentSpan(new OpenTelemetrySpan(mock(io.opentelemetry.api.trace.Span.class)));
     TransactionRunnerImpl runner = new TransactionRunnerImpl(session);
     runner.setSpan(span);