Move reqId attempt increase out of runWithRetries

Author: odeke-em

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

@@ -305,9 +305,6 @@ public CommitResponse writeAtLeastOnceWithOptions(
     try (IScope s = tracer.withSpan(span)) {
       return SpannerRetryHelper.runTxWithRetriesOnAborted(
           () -> {
-            // TODO(@odeke-em): Only increment on UNAVAILABLE and INCREMENT,
-            // instead increment the nthRequest on ABORTED and others.
-            reqId.incrementAttempt();
             return new CommitResponse(
                 spanner.getRpc().commit(request, reqId.withOptions(getOptions())));
           });
@@ -322,7 +319,7 @@ public CommitResponse writeAtLeastOnceWithOptions(
   private XGoogSpannerRequestId reqIdOrFresh(Options options) {
     XGoogSpannerRequestId reqId = options.reqId();
     if (reqId == null) {
-      reqId = this.getRequestIdCreator().nextRequestId(1 /* TODO: channelId */, 0);
+      reqId = this.getRequestIdCreator().nextRequestId(1 /* TODO: channelId */, 1);
     }
     return reqId;
   }