Implement OpenTelemetryOpts as variadic to support otelhttp and otelgrpc

Author: surik

internal/settings.go

@@ -15,7 +15,6 @@ import (
 	"time"
 
 	"cloud.google.com/go/auth"
-	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	"google.golang.org/api/internal/impersonate"
@@ -78,8 +77,8 @@ type DialSettings struct {
 	// TODO(b/372244283): Remove after b/358175516 has been fixed
 	EnableAsyncRefreshDryRun func()
 
-	// otelhttp options
-	OtelHTTPOpts []otelhttp.Option
+	// otelhttp/otelgrpc options
+	OpenTelemetryOpts []any
 }
 
 // GetScopes returns the user-provided scopes, if set, or else falls back to the

option/option.go

@@ -11,7 +11,6 @@ import (
 	"net/http"
 
 	"cloud.google.com/go/auth"
-	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	"google.golang.org/api/internal"
@@ -416,16 +415,17 @@ func (w withLogger) Apply(o *internal.DialSettings) {
 	o.Logger = w.l
 }
 
-// WithOtelHTTPOpts returns a ClientOption that sets the options for
-// the OpenTelemetry HTTP client. This option is used to configure
-// the OpenTelemetry HTTP client instrumentation.
-func WithOtelHTTPOpts(opts ...otelhttp.Option) ClientOption {
-	return withOtelHTTPOpts{opts}
+// WithOpenTelemetryOpts returns a ClientOption that sets the options for
+// the OpenTelemetry HTTP/gRPC client. This option is used to configure
+// the OpenTelemetry HTTP/gRPC client instrumentation.
+// It can accept any number of options, which can be otelhttp.Option or otelgrpc.Option.
+func WithOpenTelemetryOpts(opts ...any) ClientOption {
+	return withOpenTelemetryOpts{opts}
 }
 
-type withOtelHTTPOpts struct{ opts []otelhttp.Option }
+type withOpenTelemetryOpts struct{ opts []any }
 
-func (w withOtelHTTPOpts) Apply(o *internal.DialSettings) {
-	o.OtelHTTPOpts = make([]otelhttp.Option, len(w.opts))
-	copy(o.OtelHTTPOpts, w.opts)
+func (w withOpenTelemetryOpts) Apply(o *internal.DialSettings) {
+	o.OpenTelemetryOpts = make([]any, len(w.opts))
+	copy(o.OpenTelemetryOpts, w.opts)
 }

option/option_test.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 	"golang.org/x/oauth2/google"
 	"google.golang.org/api/internal"
 	"google.golang.org/grpc"
@@ -135,28 +134,22 @@ func TestApplyClientCertSource(t *testing.T) {
 	}
 }
 
-func TestOtelHTTPOpts(t *testing.T) {
-	otelhttpopts := []otelhttp.Option{
-		otelhttp.WithServerName("test"),
+func TestOpenTelemetryOpts(t *testing.T) {
+	otelOpts := []any{
+		"non-otelhttp-otelgrpc-option",
 	}
 	opts := []ClientOption{
-		WithOtelHTTPOpts(otelhttpopts...),
+		WithOpenTelemetryOpts(otelOpts...),
 	}
 	var got internal.DialSettings
 	for _, opt := range opts {
 		opt.Apply(&got)
 	}
 	want := internal.DialSettings{
-		OtelHTTPOpts: []otelhttp.Option{
-			otelhttp.WithServerName("test"),
-		},
+		OpenTelemetryOpts: []any{},
 	}
 
-	comparer := cmp.Comparer(func(x, y internal.DialSettings) bool {
-		return len(x.OtelHTTPOpts) == len(y.OtelHTTPOpts)
-	})
-
-	if !cmp.Equal(got, want, comparer) {
-		t.Error(cmp.Diff(got, want, comparer))
+	if cmp.Equal(got, want) {
+		t.Error(cmp.Diff(got, want))
 	}
 }

transport/grpc/dial.go

@@ -68,9 +68,9 @@ var (
 
 // otelGRPCStatsHandler returns singleton otelStatsHandler for reuse across all
 // dial connections.
-func otelGRPCStatsHandler() stats.Handler {
+func otelGRPCStatsHandler(opts []otelgrpc.Option) stats.Handler {
 	initOtelStatsHandlerOnce.Do(func() {
-		otelStatsHandler = otelgrpc.NewClientHandler()
+		otelStatsHandler = otelgrpc.NewClientHandler(opts...)
 	})
 	return otelStatsHandler
 }
@@ -400,7 +400,13 @@ func addOpenTelemetryStatsHandler(opts []grpc.DialOption, settings *internal.Dia
 	if settings.TelemetryDisabled {
 		return opts
 	}
-	return append(opts, grpc.WithStatsHandler(otelGRPCStatsHandler()))
+	otelOpts := []otelgrpc.Option{}
+	for _, opt := range settings.OpenTelemetryOpts {
+		if opt, ok := opt.(otelgrpc.Option); ok {
+			otelOpts = append(otelOpts, opt)
+		}
+	}
+	return append(opts, grpc.WithStatsHandler(otelGRPCStatsHandler(otelOpts)))
 }
 
 // grpcTokenSource supplies PerRPCCredentials from an oauth.TokenSource.

transport/http/dial.go

@@ -306,7 +306,15 @@ func addOpenTelemetryTransport(trans http.RoundTripper, settings *internal.DialS
 	if settings.TelemetryDisabled {
 		return trans
 	}
-	return otelhttp.NewTransport(trans, settings.OtelHTTPOpts...)
+
+	opts := []otelhttp.Option{}
+	for _, opt := range settings.OpenTelemetryOpts {
+		if opt, ok := opt.(otelhttp.Option); ok {
+			opts = append(opts, opt)
+		}
+	}
+
+	return otelhttp.NewTransport(trans, opts...)
 }
 
 // clonedTransport returns the given RoundTripper as a cloned *http.Transport.