exporter/otlp: fix User-Agent header being ignored in gRPC exporter

Signed-off-by: 57Ajay <57ajay.u@gmail.com>

Author: 57Ajay

.chloggen/fix-otlp-grpc-user-agent.yaml

@@ -0,0 +1,10 @@
+change_type: bug_fix
+component: exporter/otlp
+note: Fix User-Agent header being ignored when configured in the gRPC exporter headers.
+issues: [14686]
+subtext: |
+  The otlp gRPC exporter was unconditionally setting the User-Agent via
+  grpc.WithUserAgent() at dial time, which takes precedence over per-call
+  metadata. A user-configured User-Agent header was silently discarded.
+  The fix checks for a user-supplied User-Agent in the headers config and
+  uses it in the dial option directly.

exporter/otlpexporter/otlp.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"fmt"
 	"runtime"
+	"strings"
 
 	"go.uber.org/zap"
 	"google.golang.org/genproto/googleapis/rpc/errdetails"
@@ -34,7 +35,6 @@ import (
 type baseExporter struct {
 	// Input configuration.
 	config *Config
-
 	// gRPC clients and connection.
 	traceExporter   ptraceotlp.GRPCClient
 	metricExporter  pmetricotlp.GRPCClient
@@ -62,18 +62,25 @@ func newExporter(cfg component.Config, set exporter.Settings) *baseExporter {
 // start actually creates the gRPC connection. The client construction is deferred till this point as this
 // is the only place we get hold of Extensions which are required to construct auth round tripper.
 func (e *baseExporter) start(ctx context.Context, host component.Host) (err error) {
-	agentOpt := configgrpc.WithGrpcDialOption(grpc.WithUserAgent(e.userAgent))
+	// If the user configured a User-Agent header, use it for the dial option.
+	// grpc.WithUserAgent sets the value at the transport level and takes precedence
+	// over per-call metadata, so we must pass the user's value here directly.
+	userAgent := e.userAgent
+	headers := map[string]string{}
+	for k, v := range e.config.ClientConfig.Headers.Iter {
+		headers[k] = string(v)
+		if strings.EqualFold(k, "User-Agent") {
+			userAgent = string(v)
+		}
+	}
+	agentOpt := configgrpc.WithGrpcDialOption(grpc.WithUserAgent(userAgent))
 	if e.clientConn, err = e.config.ClientConfig.ToClientConn(ctx, host.GetExtensions(), e.settings, agentOpt); err != nil {
 		return err
 	}
 	e.traceExporter = ptraceotlp.NewGRPCClient(e.clientConn)
 	e.metricExporter = pmetricotlp.NewGRPCClient(e.clientConn)
 	e.logExporter = plogotlp.NewGRPCClient(e.clientConn)
 	e.profileExporter = pprofileotlp.NewGRPCClient(e.clientConn)
-	headers := map[string]string{}
-	for k, v := range e.config.ClientConfig.Headers.Iter {
-		headers[k] = string(v)
-	}
 	e.metadata = metadata.New(headers)
 	e.callOptions = []grpc.CallOption{
 		grpc.WaitForReady(e.config.ClientConfig.WaitForReady),

exporter/otlpexporter/otlp_test.go

@@ -1042,3 +1042,50 @@ func TestSendProfilesWhenEndpointHasHttpScheme(t *testing.T) {
 		})
 	}
 }
+
+func TestUserAgentHeader_OverriddenByConfig(t *testing.T) {
+	// Start an OTLP-compatible receiver.
+	ln, err := net.Listen("tcp", "localhost:")
+	require.NoError(t, err, "Failed to find an available address to run the gRPC server: %v", err)
+	rcv := otlpMetricsReceiverOnGRPCServer(ln)
+	defer rcv.srv.GracefulStop()
+
+	// Start an OTLP exporter with a custom User-Agent header.
+	factory := NewFactory()
+	cfg := factory.CreateDefaultConfig().(*Config)
+	cfg.QueueConfig = configoptional.None[exporterhelper.QueueBatchConfig]()
+	cfg.ClientConfig = configgrpc.ClientConfig{
+		Endpoint: ln.Addr().String(),
+		TLS: configtls.ClientConfig{
+			Insecure: true,
+		},
+		Headers: configopaque.MapList{
+			{Name: "User-Agent", Value: "My Distribution For The Collector"},
+		},
+	}
+	set := exportertest.NewNopSettings(factory.Type())
+	set.BuildInfo.Description = "Collector"
+	set.BuildInfo.Version = "1.2.3test"
+
+	exp, err := factory.CreateMetrics(context.Background(), set, cfg)
+	require.NoError(t, err)
+	require.NotNil(t, exp)
+	defer func() {
+		assert.NoError(t, exp.Shutdown(context.Background()))
+	}()
+
+	require.NoError(t, exp.Start(context.Background(), componenttest.NewNopHost()))
+
+	// Send a metric to trigger an RPC.
+	require.NoError(t, exp.ConsumeMetrics(context.Background(), pmetric.NewMetrics()))
+
+	assert.Eventually(t, func() bool {
+		return rcv.requestCount.Load() > 0
+	}, 10*time.Second, 5*time.Millisecond)
+
+	md := rcv.getMetadata()
+	require.Len(t, md.Get("User-Agent"), 1)
+	// User-configured value must win over the builtin BuildInfo agent.
+	require.Contains(t, md.Get("User-Agent")[0], "My Distribution For The Collector")
+	require.NotContains(t, md.Get("User-Agent")[0], "Collector/1.2.3test")
+}