perf(spanner): use passthrough with emulator endpoint (#10947)

googleapis · Oct 3, 2024 · 9e964dd · 9e964dd
1 parent c67f964
commit 9e964dd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/spanner/admin/database/apiv1/init.go b/spanner/admin/database/apiv1/init.go
@@ -18,6 +18,7 @@ package database
 import (
 	"context"
 	"os"
+	"regexp"
 
 	"google.golang.org/api/option"
 	"google.golang.org/grpc"
@@ -27,8 +28,9 @@ import (
 func init() {
 	newDatabaseAdminClientHook = func(ctx context.Context, p clientHookParams) ([]option.ClientOption, error) {
 		if emulator := os.Getenv("SPANNER_EMULATOR_HOST"); emulator != "" {
+			schemeRemoved := regexp.MustCompile("^(http://|https://|passthrough:///)").ReplaceAllString(emulator, "")
 			return []option.ClientOption{
-				option.WithEndpoint(emulator),
+				option.WithEndpoint("passthrough:///" + schemeRemoved),
 				option.WithGRPCDialOption(grpc.WithTransportCredentials(insecure.NewCredentials())),
 				option.WithoutAuthentication(),
 			}, nil

diff --git a/spanner/admin/instance/apiv1/init.go b/spanner/admin/instance/apiv1/init.go
@@ -18,6 +18,7 @@ package instance
 import (
 	"context"
 	"os"
+	"regexp"
 
 	"google.golang.org/api/option"
 	"google.golang.org/grpc"
@@ -27,8 +28,9 @@ import (
 func init() {
 	newInstanceAdminClientHook = func(ctx context.Context, p clientHookParams) ([]option.ClientOption, error) {
 		if emulator := os.Getenv("SPANNER_EMULATOR_HOST"); emulator != "" {
+			schemeRemoved := regexp.MustCompile("^(http://|https://|passthrough:///)").ReplaceAllString(emulator, "")
 			return []option.ClientOption{
-				option.WithEndpoint(emulator),
+				option.WithEndpoint("passthrough:///" + schemeRemoved),
 				option.WithGRPCDialOption(grpc.WithTransportCredentials(insecure.NewCredentials())),
 				option.WithoutAuthentication(),
 			}, nil

diff --git a/spanner/client.go b/spanner/client.go
@@ -190,8 +190,9 @@ func createGCPMultiEndpoint(cfg *grpcgcp.GCPMultiEndpointOptions, config ClientC
 	}
 	// Append emulator options if SPANNER_EMULATOR_HOST has been set.
 	if emulatorAddr := os.Getenv("SPANNER_EMULATOR_HOST"); emulatorAddr != "" {
+		schemeRemoved := regexp.MustCompile("^(http://|https://|passthrough:///)").ReplaceAllString(emulatorAddr, "")
 		emulatorOpts := []option.ClientOption{
-			option.WithEndpoint(emulatorAddr),
+			option.WithEndpoint("passthrough:///" + schemeRemoved),
 			option.WithGRPCDialOption(grpc.WithTransportCredentials(insecure.NewCredentials())),
 			option.WithoutAuthentication(),
 			internaloption.SkipDialSettingsValidation(),
@@ -403,8 +404,9 @@ func newClientWithConfig(ctx context.Context, database string, config ClientConf
 
 	// Append emulator options if SPANNER_EMULATOR_HOST has been set.
 	if emulatorAddr := os.Getenv("SPANNER_EMULATOR_HOST"); emulatorAddr != "" {
+		schemeRemoved := regexp.MustCompile("^(http://|https://|passthrough:///)").ReplaceAllString(emulatorAddr, "")
 		emulatorOpts := []option.ClientOption{
-			option.WithEndpoint(emulatorAddr),
+			option.WithEndpoint("passthrough:///" + schemeRemoved),
 			option.WithGRPCDialOption(grpc.WithTransportCredentials(insecure.NewCredentials())),
 			option.WithoutAuthentication(),
 			internaloption.SkipDialSettingsValidation(),