rebase

Author: surbhigarg92

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

@@ -1997,6 +1997,9 @@ private GrpcCallContext createBaseCallContext() {
     if (endToEndTracingEnabled) {
       context = context.withExtraHeaders(metadataProvider.newEndToEndTracingHeader());
     }
+    if (isEnableAFEServerTiming()) {
+      context = context.withExtraHeaders(metadataProvider.newAfeServerTimingHeader());
+    }
     return context
         .withStreamWaitTimeoutDuration(waitTimeout)
         .withStreamIdleTimeoutDuration(idleTimeout);
@@ -2047,12 +2050,6 @@ <ReqT, RespT> GrpcCallContext newCallContext(
     if (routeToLeader && leaderAwareRoutingEnabled) {
       context = context.withExtraHeaders(metadataProvider.newRouteToLeaderHeader());
     }
-    if (endToEndTracingEnabled) {
-      context = context.withExtraHeaders(metadataProvider.newEndToEndTracingHeader());
-    }
-    if (isEnableAFEServerTiming()) {
-      context = context.withExtraHeaders(metadataProvider.newAfeServerTimingHeader());
-    }
     if (callCredentialsProvider != null) {
       CallCredentials callCredentials = callCredentialsProvider.getCallCredentials();
       if (callCredentials != null) {