fix(bigtable): Correct the Bigtable monitoring client options (#12410)

bhshkh · web-flow · commit bd966bc089d6 · 2025-06-09T15:25:03.000-04:00
diff --git a/bigtable/metrics.go b/bigtable/metrics.go
@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"reflect"
 	"time"
 
 	"cloud.google.com/go/bigtable/internal"
@@ -123,11 +124,20 @@ var (
 		return "go-" + uuid.NewString() + "@" + hostname, nil
 	}
 
+	endpointOptionType = reflect.TypeOf(option.WithEndpoint(""))
+
 	// GCM exporter should use the same options as Bigtable client
-	// createExporterOptions takes Bigtable client options and returns exporter options
+	// createExporterOptions takes Bigtable client options and returns exporter options,
+	// filtering out any WithEndpoint option to ensure the metrics exporter uses its default endpoint.
 	// Overwritten in tests
 	createExporterOptions = func(btOpts ...option.ClientOption) []option.ClientOption {
-		return btOpts
+		filteredOptions := []option.ClientOption{}
+		for _, opt := range btOpts {
+			if reflect.TypeOf(opt) != endpointOptionType {
+				filteredOptions = append(filteredOptions, opt)
+			}
+		}
+		return filteredOptions
 	}
 )
 
diff --git a/bigtable/metrics_test.go b/bigtable/metrics_test.go
@@ -22,6 +22,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"io"
+	"reflect"
 	"slices"
 	"sort"
 	"strings"
@@ -476,3 +477,49 @@ func TestToOtelMetricAttrs(t *testing.T) {
 		})
 	}
 }
+
+func TestCreateExporterOptionsFiltering(t *testing.T) {
+	endpointOpt := option.WithEndpoint("test.endpoint")
+	apiKeyOpt := option.WithAPIKey("test.apikey")
+	audiencesOpt := option.WithAudiences("test.audience")
+
+	inputOpts := []option.ClientOption{
+		endpointOpt,
+		apiKeyOpt,
+		audiencesOpt,
+	}
+
+	filteredOpts := createExporterOptions(inputOpts...)
+
+	foundEndpointOpt := false
+	foundAPIKeyOpt := false
+	foundAudiencesOpt := false
+
+	for _, opt := range filteredOpts {
+		if reflect.TypeOf(opt) == reflect.TypeOf(endpointOpt) {
+			foundEndpointOpt = true
+		}
+		if reflect.TypeOf(opt) == reflect.TypeOf(apiKeyOpt) {
+			foundAPIKeyOpt = true
+		}
+		if reflect.TypeOf(opt) == reflect.TypeOf(audiencesOpt) {
+			foundAudiencesOpt = true
+		}
+	}
+
+	if foundEndpointOpt {
+		t.Errorf("option.WithEndpoint was found in filtered options, but it should have been filtered out")
+	}
+
+	if !foundAPIKeyOpt {
+		t.Errorf("option.WithAPIKey was not found in filtered options, but it should have been preserved")
+	}
+
+	if !foundAudiencesOpt {
+		t.Errorf("option.WithAudiences was not found in filtered options, but it should have been preserved")
+	}
+
+	if len(filteredOpts) != 2 {
+		t.Errorf("Expected 2 options to be returned, got %d", len(filteredOpts))
+	}
+}
