ci(spanner): Fix directpath nightly jobs in spanner (#12607)

* ci(spanner): Fix directpath nightly jobs in spanner

* Fix formatting

Author: sakthivelmanii

spanner/integration_test.go

@@ -3675,6 +3675,8 @@ func TestIntegration_ReadErrors(t *testing.T) {
 // Test TransactionRunner. Test that transactions are aborted and retried as
 // expected.
 func TestIntegration_TransactionRunner(t *testing.T) {
+	// TODO(sakthivelmani): Enable the tests once b/422916293 is fixed
+	skipDirectPathTest(t)
 	skipEmulatorTest(t)
 	t.Parallel()
 
@@ -5893,11 +5895,7 @@ func TestIntegration_Foreign_Key_Delete_Cascade_Action(t *testing.T) {
 }
 
 func TestIntegration_GFE_Latency(t *testing.T) {
-	if directPathEnabled, found := os.LookupEnv("GOOGLE_SPANNER_ENABLE_DIRECT_ACCESS"); found {
-		if enabled, _ := strconv.ParseBool(directPathEnabled); enabled {
-			t.Skip("Skipping GFE tests when DirectPath is enabled")
-		}
-	}
+	skipDirectPathTest(t)
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
 	defer cancel()
 
@@ -6770,6 +6768,14 @@ func skipEmulatorTest(t *testing.T) {
 	}
 }
 
+func skipDirectPathTest(t *testing.T) {
+	if directPathEnabled, found := os.LookupEnv("GOOGLE_SPANNER_ENABLE_DIRECT_ACCESS"); found {
+		if enabled, _ := strconv.ParseBool(directPathEnabled); enabled {
+			t.Skip("Skipping GFE tests when DirectPath is enabled")
+		}
+	}
+}
+
 func skipUnsupportedPGTest(t *testing.T) {
 	if testDialect == adminpb.DatabaseDialect_POSTGRESQL {
 		t.Skip("Skipping testing of unsupported tests in Postgres dialect.")

spanner/regression_test.go

@@ -19,8 +19,10 @@ import (
 	"errors"
 	"fmt"
 	"maps"
+	"os"
 	"slices"
 	"sort"
+	"strconv"
 	"testing"
 
 	sppb "cloud.google.com/go/spanner/apiv1/spannerpb"
@@ -60,6 +62,11 @@ func (oi *ourInterceptor) interceptUnary(ctx context.Context, req any, usi *grpc
 	return handler(ctx, req)
 }
 
+func directPathEnabled() bool {
+	enabled, _ := strconv.ParseBool(os.Getenv("GOOGLE_SPANNER_ENABLE_DIRECT_ACCESS"))
+	return enabled
+}
+
 // This is a regression test to assert that all the expected headers are propagated
 // along to the final gRPC server avoiding scenarios where headers got dropped from a
 // destructive context augmentation call.
@@ -138,36 +145,41 @@ func TestAllHeadersForwardedAppropriately(t *testing.T) {
 		WantHeaders []string
 	}
 
+	var dynamicHeaders []string
+	if directPathEnabled() {
+		dynamicHeaders = []string{"x-goog-spanner-enable-afe-server-timing"}
+	}
+
 	wantUnaryExpectations := []*headerExpectation{
 		{
 			"/google.spanner.v1.Spanner/BatchCreateSessions",
-			[]string{
+			append([]string{
 				":authority", "content-type", "google-cloud-resource-prefix",
 				"grpc-accept-encoding", "user-agent", "x-goog-api-client",
 				"x-goog-request-params", "x-goog-spanner-end-to-end-tracing",
 				"x-goog-spanner-request-id", "x-goog-spanner-route-to-leader",
-			},
+			}, dynamicHeaders...),
 		},
 		{
 			"/google.spanner.v1.Spanner/BeginTransaction",
-			[]string{
+			append([]string{
 				":authority", "content-type", "google-cloud-resource-prefix",
 				"grpc-accept-encoding", "user-agent", "x-goog-api-client",
 				"x-goog-request-params", "x-goog-spanner-end-to-end-tracing",
 				"x-goog-spanner-request-id",
-			},
+			}, dynamicHeaders...),
 		},
 	}
 
 	wantStreamingExpectations := []*headerExpectation{
 		{
 			"/google.spanner.v1.Spanner/ExecuteStreamingSql",
-			[]string{
+			append([]string{
 				":authority", "content-type", "google-cloud-resource-prefix",
 				"grpc-accept-encoding", "user-agent", "x-goog-api-client",
 				"x-goog-request-params", "x-goog-spanner-end-to-end-tracing",
 				"x-goog-spanner-request-id",
-			},
+			}, dynamicHeaders...),
 		},
 	}