[chore] update configgrpc.ServerConfig and configgrpc.ClientConfig to use configoptional for Keepalive, Auth, and ServerConfig.TLS

jackgopack4 · jackgopack4 · commit ae957a6b814c · 2025-07-08T18:13:34.000-04:00
diff --git a/exporter/coralogixexporter/factory_test.go b/exporter/coralogixexporter/factory_test.go
@@ -14,6 +14,7 @@ import (
 	"go.opentelemetry.io/collector/config/configcompression"
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/configopaque"
+	"go.opentelemetry.io/collector/config/configoptional"
 	"go.opentelemetry.io/collector/config/configretry"
 	"go.opentelemetry.io/collector/config/configtls"
 	"go.opentelemetry.io/collector/exporter/exporterhelper"
@@ -104,11 +105,11 @@ func TestCreateTraces(t *testing.T) {
 			config: &Config{
 				Traces: configgrpc.ClientConfig{
 					Endpoint: endpoint,
-					Keepalive: &configgrpc.KeepaliveClientConfig{
+					Keepalive: configoptional.Some(configgrpc.KeepaliveClientConfig{
 						Time:                30 * time.Second,
 						Timeout:             25 * time.Second,
 						PermitWithoutStream: true,
-					},
+					}),
 				},
 			},
 		},
diff --git a/exporter/coralogixexporter/go.mod b/exporter/coralogixexporter/go.mod
@@ -10,6 +10,7 @@ require (
 	go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250708151327-74cb2f311035
 	go.opentelemetry.io/collector/config/configgrpc v0.129.1-0.20250708151327-74cb2f311035
 	go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035
+	go.opentelemetry.io/collector/config/configoptional v0.129.0
 	go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035
 	go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035
 	go.opentelemetry.io/collector/confmap v1.35.1-0.20250708151327-74cb2f311035
@@ -59,7 +60,6 @@ require (
 	go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250708151327-74cb2f311035 // indirect
 	go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250708151327-74cb2f311035 // indirect
 	go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035 // indirect
-	go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect
 	go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.129.1-0.20250708151327-74cb2f311035 // indirect
 	go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250708151327-74cb2f311035 // indirect
 	go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250708151327-74cb2f311035 // indirect
diff --git a/exporter/opencensusexporter/config_test.go b/exporter/opencensusexporter/config_test.go
@@ -13,6 +13,7 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/configopaque"
+	"go.opentelemetry.io/collector/config/configoptional"
 	"go.opentelemetry.io/collector/config/configretry"
 	"go.opentelemetry.io/collector/config/configtls"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
@@ -64,11 +65,11 @@ func TestLoadConfig(t *testing.T) {
 						},
 						Insecure: false,
 					},
-					Keepalive: &configgrpc.KeepaliveClientConfig{
+					Keepalive: configoptional.Some(configgrpc.KeepaliveClientConfig{
 						Time:                20,
 						PermitWithoutStream: true,
 						Timeout:             30,
-					},
+					}),
 					WriteBufferSize: 512 * 1024,
 					BalancerName:    "round_robin",
 				},
diff --git a/exporter/opencensusexporter/factory_test.go b/exporter/opencensusexporter/factory_test.go
@@ -14,6 +14,7 @@ import (
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/configopaque"
+	"go.opentelemetry.io/collector/config/configoptional"
 	"go.opentelemetry.io/collector/config/configtls"
 	"go.opentelemetry.io/collector/exporter/exportertest"
 
@@ -75,11 +76,11 @@ func TestCreateTraces(t *testing.T) {
 			config: &Config{
 				ClientConfig: configgrpc.ClientConfig{
 					Endpoint: endpoint,
-					Keepalive: &configgrpc.KeepaliveClientConfig{
+					Keepalive: configoptional.Some(configgrpc.KeepaliveClientConfig{
 						Time:                30 * time.Second,
 						Timeout:             25 * time.Second,
 						PermitWithoutStream: true,
-					},
+					}),
 				},
 				NumWorkers: 3,
 			},
diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod
@@ -12,6 +12,7 @@ require (
 	go.opentelemetry.io/collector/component/componenttest v0.129.1-0.20250708151327-74cb2f311035
 	go.opentelemetry.io/collector/config/configgrpc v0.129.1-0.20250708151327-74cb2f311035
 	go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035
+	go.opentelemetry.io/collector/config/configoptional v0.129.0
 	go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035
 	go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035
 	go.opentelemetry.io/collector/confmap v1.35.1-0.20250708151327-74cb2f311035
@@ -67,7 +68,6 @@ require (
 	go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250708151327-74cb2f311035 // indirect
 	go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250708151327-74cb2f311035 // indirect
 	go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035 // indirect
-	go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect
 	go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250708151327-74cb2f311035 // indirect
 	go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250708151327-74cb2f311035 // indirect
 	go.opentelemetry.io/collector/exporter/xexporter v0.129.1-0.20250708151327-74cb2f311035 // indirect
diff --git a/exporter/otelarrowexporter/config_test.go b/exporter/otelarrowexporter/config_test.go
@@ -17,6 +17,7 @@ import (
 	"go.opentelemetry.io/collector/config/configcompression"
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/configopaque"
+	"go.opentelemetry.io/collector/config/configoptional"
 	"go.opentelemetry.io/collector/config/configretry"
 	"go.opentelemetry.io/collector/config/configtls"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
@@ -83,14 +84,14 @@ func TestUnmarshalConfig(t *testing.T) {
 					},
 					Insecure: false,
 				},
-				Keepalive: &configgrpc.KeepaliveClientConfig{
+				Keepalive: configoptional.Some(configgrpc.KeepaliveClientConfig{
 					Time:                20 * time.Second,
 					PermitWithoutStream: true,
 					Timeout:             30 * time.Second,
-				},
+				}),
 				WriteBufferSize: 512 * 1024,
 				BalancerName:    "experimental",
-				Auth:            &configauth.Config{AuthenticatorID: component.NewID(component.MustNewType("nop"))},
+				Auth:            configoptional.Some(configauth.Config{AuthenticatorID: component.NewID(component.MustNewType("nop"))}),
 			},
 			Arrow: ArrowConfig{
 				NumStreams:         2,
diff --git a/exporter/otelarrowexporter/factory_test.go b/exporter/otelarrowexporter/factory_test.go
@@ -16,6 +16,7 @@ import (
 	"go.opentelemetry.io/collector/config/configcompression"
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/configopaque"
+	"go.opentelemetry.io/collector/config/configoptional"
 	"go.opentelemetry.io/collector/config/configretry"
 	"go.opentelemetry.io/collector/config/configtls"
 	"go.opentelemetry.io/collector/exporter/exporterhelper"
@@ -94,11 +95,11 @@ func TestCreateTraces(t *testing.T) {
 			config: Config{
 				ClientConfig: configgrpc.ClientConfig{
 					Endpoint: endpoint,
-					Keepalive: &configgrpc.KeepaliveClientConfig{
+					Keepalive: configoptional.Some(configgrpc.KeepaliveClientConfig{
 						Time:                30 * time.Second,
 						Timeout:             25 * time.Second,
 						PermitWithoutStream: true,
-					},
+					}),
 				},
 			},
 		},
diff --git a/exporter/otelarrowexporter/go.mod b/exporter/otelarrowexporter/go.mod
@@ -15,6 +15,7 @@ require (
 	go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250708151327-74cb2f311035
 	go.opentelemetry.io/collector/config/configgrpc v0.129.1-0.20250708151327-74cb2f311035
 	go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035
+	go.opentelemetry.io/collector/config/configoptional v0.129.0
 	go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035
 	go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035
 	go.opentelemetry.io/collector/confmap v1.35.1-0.20250708151327-74cb2f311035
@@ -77,7 +78,6 @@ require (
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250708151327-74cb2f311035 // indirect
 	go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035 // indirect
-	go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect
 	go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250708151327-74cb2f311035 // indirect
 	go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250708151327-74cb2f311035 // indirect
 	go.opentelemetry.io/collector/exporter/xexporter v0.129.1-0.20250708151327-74cb2f311035 // indirect
diff --git a/exporter/otelarrowexporter/otelarrow.go b/exporter/otelarrowexporter/otelarrow.go
@@ -138,9 +138,9 @@ func (e *baseExporter) start(ctx context.Context, host component.Host) (err erro
 		ctx := e.enhanceContext(context.Background())
 
 		var perRPCCreds credentials.PerRPCCredentials
-		if e.config.Auth != nil {
+		if e.config.Auth.HasValue() {
 			// Get the auth extension, we'll use it to enrich the request context.
-			authClient, err := e.config.Auth.GetGRPCClientAuthenticator(ctx, host.GetExtensions())
+			authClient, err := e.config.Auth.Get().GetGRPCClientAuthenticator(ctx, host.GetExtensions())
 			if err != nil {
 				return err
 			}
diff --git a/exporter/otelarrowexporter/otelarrow_test.go b/exporter/otelarrowexporter/otelarrow_test.go
@@ -26,6 +26,7 @@ import (
 	"go.opentelemetry.io/collector/config/configauth"
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/configopaque"
+	"go.opentelemetry.io/collector/config/configoptional"
 	"go.opentelemetry.io/collector/config/configtls"
 	"go.opentelemetry.io/collector/exporter"
 	"go.opentelemetry.io/collector/exporter/exportertest"
@@ -315,9 +316,9 @@ func TestSendTraces(t *testing.T) {
 		Headers: map[string]configopaque.String{
 			"header": configopaque.String(expectedHeader[0]),
 		},
-		Auth: &configauth.Config{
+		Auth: configoptional.Some(configauth.Config{
 			AuthenticatorID: authID,
-		},
+		}),
 	}
 	// This test fails w/ Arrow enabled because the function
 	// passed to newTestAuthExtension() below requires it the
@@ -924,9 +925,9 @@ func testSendArrowTraces(t *testing.T, clientWaitForReady, streamServiceAvailabl
 		Headers: map[string]configopaque.String{
 			"header": configopaque.String(expectedHeader[0]),
 		},
-		Auth: &configauth.Config{
+		Auth: configoptional.Some(configauth.Config{
 			AuthenticatorID: authID,
-		},
+		}),
 	}
 	// Arrow client is enabled, but the server doesn't support it.
 	cfg.Arrow.NumStreams = 1
diff --git a/internal/otelarrow/go.mod b/internal/otelarrow/go.mod
@@ -11,6 +11,7 @@ require (
 	go.opentelemetry.io/collector/component v1.35.1-0.20250708151327-74cb2f311035
 	go.opentelemetry.io/collector/component/componenttest v0.129.1-0.20250708151327-74cb2f311035
 	go.opentelemetry.io/collector/config/configgrpc v0.129.1-0.20250708151327-74cb2f311035
+	go.opentelemetry.io/collector/config/configoptional v0.129.0
 	go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250708151327-74cb2f311035
 	go.opentelemetry.io/collector/consumer v1.35.1-0.20250708151327-74cb2f311035
 	go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250708151327-74cb2f311035
@@ -77,7 +78,6 @@ require (
 	go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250708151327-74cb2f311035 // indirect
 	go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035 // indirect
 	go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035 // indirect
-	go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect
 	go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035 // indirect
 	go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035 // indirect
 	go.opentelemetry.io/collector/confmap v1.35.1-0.20250708151327-74cb2f311035 // indirect
diff --git a/internal/otelarrow/test/e2e_test.go b/internal/otelarrow/test/e2e_test.go
@@ -22,6 +22,7 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config/configgrpc"
+	"go.opentelemetry.io/collector/config/configoptional"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/consumer/consumertest"
@@ -612,12 +613,12 @@ func TestIntegrationSelfTracing(t *testing.T) {
 	}
 
 	testIntegrationTraces(ctx, t, params, func(_ *ExpConfig, rcfg *RecvConfig) {
-		rcfg.GRPC.Keepalive = &configgrpc.KeepaliveServerConfig{
+		rcfg.GRPC.Keepalive = configoptional.Some(configgrpc.KeepaliveServerConfig{
 			ServerParameters: &configgrpc.KeepaliveServerParameters{
 				MaxConnectionAge:      time.Second,
 				MaxConnectionAgeGrace: 5 * time.Second,
 			},
-		}
+		})
 	}, func() GenFunc { return makeTestTraces }, consumerSuccess, multiStreamEnding)
 }
 
diff --git a/receiver/jaegerreceiver/config_test.go b/receiver/jaegerreceiver/config_test.go
@@ -13,6 +13,7 @@ import (
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/config/confignet"
+	"go.opentelemetry.io/collector/config/configoptional"
 	"go.opentelemetry.io/collector/config/configtls"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
 	"go.opentelemetry.io/collector/confmap/xconfmap"
@@ -114,12 +115,12 @@ func TestLoadConfig(t *testing.T) {
 							Endpoint:  "localhost:9876",
 							Transport: confignet.TransportTypeTCP,
 						},
-						TLS: &configtls.ServerConfig{
+						TLS: configoptional.Some(configtls.ServerConfig{
 							Config: configtls.Config{
 								CertFile: "/test.crt",
 								KeyFile:  "/test.key",
 							},
-						},
+						}),
 					},
 					ThriftHTTP: &confighttp.ServerConfig{
 						Endpoint: ":3456",
diff --git a/receiver/jaegerreceiver/factory_test.go b/receiver/jaegerreceiver/factory_test.go
@@ -104,12 +104,12 @@ func TestCreateTLSGPRCEndpoint(t *testing.T) {
 			Endpoint:  "0.0.0.0:14250",
 			Transport: confignet.TransportTypeTCP,
 		},
-		TLS: &configtls.ServerConfig{
+		TLS: configoptional.Some(configtls.ServerConfig{
 			Config: configtls.Config{
 				CertFile: "./testdata/server.crt",
 				KeyFile:  "./testdata/server.key",
 			},
-		},
+		}),
 	}
 	set := receivertest.NewNopSettings(metadata.Type)
 
diff --git a/receiver/jaegerreceiver/trace_receiver_test.go b/receiver/jaegerreceiver/trace_receiver_test.go
@@ -27,6 +27,7 @@ import (
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/config/confignet"
+	"go.opentelemetry.io/collector/config/configoptional"
 	"go.opentelemetry.io/collector/config/configtls"
 	"go.opentelemetry.io/collector/consumer/consumertest"
 	"go.opentelemetry.io/collector/pdata/pcommon"
@@ -188,7 +189,7 @@ func TestGRPCReception(t *testing.T) {
 
 func TestGRPCReceptionWithTLS(t *testing.T) {
 	// prepare
-	tlsCreds := &configtls.ServerConfig{
+	tlsCreds := configtls.ServerConfig{
 		Config: configtls.Config{
 			CertFile: filepath.Join("testdata", "server.crt"),
 			KeyFile:  filepath.Join("testdata", "server.key"),
@@ -200,7 +201,7 @@ func TestGRPCReceptionWithTLS(t *testing.T) {
 			Endpoint:  testutil.GetAvailableLocalAddress(t),
 			Transport: confignet.TransportTypeTCP,
 		},
-		TLS: tlsCreds,
+		TLS: configoptional.Some(tlsCreds),
 	}
 
 	config := Protocols{
diff --git a/receiver/opencensusreceiver/config_test.go b/receiver/opencensusreceiver/config_test.go
@@ -13,6 +13,7 @@ import (
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/confignet"
+	"go.opentelemetry.io/collector/config/configoptional"
 	"go.opentelemetry.io/collector/config/configtls"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
 	"go.opentelemetry.io/collector/confmap/xconfmap"
@@ -51,7 +52,7 @@ func TestLoadConfig(t *testing.T) {
 						Transport: confignet.TransportTypeTCP,
 					},
 					ReadBufferSize: 512 * 1024,
-					Keepalive: &configgrpc.KeepaliveServerConfig{
+					Keepalive: configoptional.Some(configgrpc.KeepaliveServerConfig{
 						ServerParameters: &configgrpc.KeepaliveServerParameters{
 							MaxConnectionIdle:     11 * time.Second,
 							MaxConnectionAge:      12 * time.Second,
@@ -63,7 +64,7 @@ func TestLoadConfig(t *testing.T) {
 							MinTime:             10 * time.Second,
 							PermitWithoutStream: true,
 						},
-					},
+					}),
 				},
 			},
 		},
@@ -79,11 +80,11 @@ func TestLoadConfig(t *testing.T) {
 					MaxConcurrentStreams: 16,
 					ReadBufferSize:       1024,
 					WriteBufferSize:      1024,
-					Keepalive: &configgrpc.KeepaliveServerConfig{
+					Keepalive: configoptional.Some(configgrpc.KeepaliveServerConfig{
 						ServerParameters: &configgrpc.KeepaliveServerParameters{
 							MaxConnectionIdle: 10 * time.Second,
 						},
-					},
+					}),
 				},
 			},
 		},
@@ -96,12 +97,12 @@ func TestLoadConfig(t *testing.T) {
 						Transport: confignet.TransportTypeTCP,
 					},
 					ReadBufferSize: 512 * 1024,
-					TLS: &configtls.ServerConfig{
+					TLS: configoptional.Some(configtls.ServerConfig{
 						Config: configtls.Config{
 							CertFile: "test.crt",
 							KeyFile:  "test.key",
 						},
-					},
+					}),
 				},
 			},
 		},
diff --git a/receiver/opencensusreceiver/factory_test.go b/receiver/opencensusreceiver/factory_test.go
@@ -13,6 +13,7 @@ import (
 	"go.opentelemetry.io/collector/component/componenttest"
 	"go.opentelemetry.io/collector/config/configgrpc"
 	"go.opentelemetry.io/collector/config/confignet"
+	"go.opentelemetry.io/collector/config/configoptional"
 	"go.opentelemetry.io/collector/consumer/consumertest"
 	"go.opentelemetry.io/collector/receiver/receivertest"
 
@@ -134,15 +135,15 @@ func TestCreateMetrics(t *testing.T) {
 			cfg: &Config{
 				ServerConfig: configgrpc.ServerConfig{
 					NetAddr: defaultNetAddr,
-					Keepalive: &configgrpc.KeepaliveServerConfig{
+					Keepalive: configoptional.Some(configgrpc.KeepaliveServerConfig{
 						ServerParameters: &configgrpc.KeepaliveServerParameters{
 							MaxConnectionAge: 60 * time.Second,
 						},
 						EnforcementPolicy: &configgrpc.KeepaliveEnforcementPolicy{
 							MinTime:             30 * time.Second,
 							PermitWithoutStream: true,
 						},
-					},
+					}),
 				},
 			},
 		},
diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod
diff --git a/receiver/opencensusreceiver/opencensus_test.go b/receiver/opencensusreceiver/opencensus_test.go
diff --git a/receiver/otelarrowreceiver/config_test.go b/receiver/otelarrowreceiver/config_test.go
diff --git a/receiver/otelarrowreceiver/go.mod b/receiver/otelarrowreceiver/go.mod
diff --git a/receiver/otelarrowreceiver/otelarrow.go b/receiver/otelarrowreceiver/otelarrow.go
diff --git a/receiver/otelarrowreceiver/otelarrow_test.go b/receiver/otelarrowreceiver/otelarrow_test.go
diff --git a/receiver/skywalkingreceiver/factory_test.go b/receiver/skywalkingreceiver/factory_test.go
