diff --git a/exporter/coralogixexporter/factory_test.go b/exporter/coralogixexporter/factory_test.go index 8745498792216..ba831f3e364e8 100644 --- 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 index ab18647ade280..978d49867e456 100644 --- 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.1-0.20250708151327-74cb2f311035 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/coralogixexporter/go.sum b/exporter/coralogixexporter/go.sum index e16141f56b4f3..755e96f0381dc 100644 --- a/exporter/coralogixexporter/go.sum +++ b/exporter/coralogixexporter/go.sum @@ -92,8 +92,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f31 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035 h1:k2/Q3E8/dVGWU+kNfj5EEx2022XbFAYIEzALeD/b2Fc= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:aAOmM/mSWE2F3A58x4MUw1bYW8TIjVxn5/WfgxRgMu0= -go.opentelemetry.io/collector/config/configoptional v0.129.0 h1:6zcdvQglWrcFhhzcDcPPlWCRJ2OgrqQQIwLGawamxEM= -go.opentelemetry.io/collector/config/configoptional v0.129.0/go.mod h1:H5r7h2Dp0t03Fc1cmYEcPGd5lsoW4Qb/NYmBdamf0OU= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035 h1:LIsFowfCCklhLaq1dhN0wV1DjAxytMj0c7z3R57BWkA= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035 h1:gmcHY/NnnKI645BIaERUaa7C6MbzZUJp0L38TbytajQ= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035 h1:590KTky/NL5A0NVKxcC5QPy/nAIB2fxE1wEMDN/f6SI= diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index 15fc86699000b..e49f00e672ff0 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -117,7 +117,7 @@ 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/configoptional v0.129.1-0.20250708151327-74cb2f311035 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250708151327-74cb2f311035 // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035 // indirect go.opentelemetry.io/collector/confmap/provider/envprovider v1.35.1-0.20250708151327-74cb2f311035 // indirect diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index dc2658b47718e..b43df6f49c8e3 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -223,8 +223,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f31 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035 h1:k2/Q3E8/dVGWU+kNfj5EEx2022XbFAYIEzALeD/b2Fc= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:aAOmM/mSWE2F3A58x4MUw1bYW8TIjVxn5/WfgxRgMu0= -go.opentelemetry.io/collector/config/configoptional v0.129.0 h1:6zcdvQglWrcFhhzcDcPPlWCRJ2OgrqQQIwLGawamxEM= -go.opentelemetry.io/collector/config/configoptional v0.129.0/go.mod h1:H5r7h2Dp0t03Fc1cmYEcPGd5lsoW4Qb/NYmBdamf0OU= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035 h1:LIsFowfCCklhLaq1dhN0wV1DjAxytMj0c7z3R57BWkA= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035 h1:gmcHY/NnnKI645BIaERUaa7C6MbzZUJp0L38TbytajQ= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250708151327-74cb2f311035 h1:LQDlCI8ecje+D5O9i7uAngh/Thl79A+3vYhigMNGZNs= diff --git a/exporter/opencensusexporter/config_test.go b/exporter/opencensusexporter/config_test.go index d960e652fdc10..b18f26f74a80f 100644 --- 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 index 1141883460bf2..ca0ee773df1b1 100644 --- 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 index e28dcee49f3c2..3a207d1424213 100644 --- 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.1-0.20250708151327-74cb2f311035 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/opencensusexporter/go.sum b/exporter/opencensusexporter/go.sum index 0e582fdc6904f..f21488a706d30 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -142,8 +142,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f31 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035 h1:k2/Q3E8/dVGWU+kNfj5EEx2022XbFAYIEzALeD/b2Fc= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:aAOmM/mSWE2F3A58x4MUw1bYW8TIjVxn5/WfgxRgMu0= -go.opentelemetry.io/collector/config/configoptional v0.129.0 h1:6zcdvQglWrcFhhzcDcPPlWCRJ2OgrqQQIwLGawamxEM= -go.opentelemetry.io/collector/config/configoptional v0.129.0/go.mod h1:H5r7h2Dp0t03Fc1cmYEcPGd5lsoW4Qb/NYmBdamf0OU= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035 h1:LIsFowfCCklhLaq1dhN0wV1DjAxytMj0c7z3R57BWkA= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035 h1:gmcHY/NnnKI645BIaERUaa7C6MbzZUJp0L38TbytajQ= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035 h1:590KTky/NL5A0NVKxcC5QPy/nAIB2fxE1wEMDN/f6SI= diff --git a/exporter/otelarrowexporter/config_test.go b/exporter/otelarrowexporter/config_test.go index 4319dfc2778bc..f08daa7f05d7b 100644 --- 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 index 185072fab61bf..5be3dd28255e3 100644 --- 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 index 2550892354bfd..8e45e1f733657 100644 --- 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.1-0.20250708151327-74cb2f311035 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/go.sum b/exporter/otelarrowexporter/go.sum index e88d048b1a259..28c74bdda057e 100644 --- a/exporter/otelarrowexporter/go.sum +++ b/exporter/otelarrowexporter/go.sum @@ -145,8 +145,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f31 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035 h1:k2/Q3E8/dVGWU+kNfj5EEx2022XbFAYIEzALeD/b2Fc= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:aAOmM/mSWE2F3A58x4MUw1bYW8TIjVxn5/WfgxRgMu0= -go.opentelemetry.io/collector/config/configoptional v0.129.0 h1:6zcdvQglWrcFhhzcDcPPlWCRJ2OgrqQQIwLGawamxEM= -go.opentelemetry.io/collector/config/configoptional v0.129.0/go.mod h1:H5r7h2Dp0t03Fc1cmYEcPGd5lsoW4Qb/NYmBdamf0OU= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035 h1:LIsFowfCCklhLaq1dhN0wV1DjAxytMj0c7z3R57BWkA= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035 h1:gmcHY/NnnKI645BIaERUaa7C6MbzZUJp0L38TbytajQ= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250708151327-74cb2f311035 h1:LQDlCI8ecje+D5O9i7uAngh/Thl79A+3vYhigMNGZNs= diff --git a/exporter/otelarrowexporter/otelarrow.go b/exporter/otelarrowexporter/otelarrow.go index e5ee8d9052ceb..bb1266e8b0999 100644 --- 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 index 10273f68d55db..9a4b40b8b4cf4 100644 --- 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/exporter/stefexporter/go.mod b/exporter/stefexporter/go.mod index 885f7b7d0eec0..bffb1308977ee 100644 --- a/exporter/stefexporter/go.mod +++ b/exporter/stefexporter/go.mod @@ -58,7 +58,7 @@ 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/configoptional v0.129.1-0.20250708151327-74cb2f311035 // indirect go.opentelemetry.io/collector/consumer/consumererror 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/stefexporter/go.sum b/exporter/stefexporter/go.sum index 6a060d5d7e612..5b5d07b48e004 100644 --- a/exporter/stefexporter/go.sum +++ b/exporter/stefexporter/go.sum @@ -104,8 +104,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f31 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035 h1:k2/Q3E8/dVGWU+kNfj5EEx2022XbFAYIEzALeD/b2Fc= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:aAOmM/mSWE2F3A58x4MUw1bYW8TIjVxn5/WfgxRgMu0= -go.opentelemetry.io/collector/config/configoptional v0.129.0 h1:6zcdvQglWrcFhhzcDcPPlWCRJ2OgrqQQIwLGawamxEM= -go.opentelemetry.io/collector/config/configoptional v0.129.0/go.mod h1:H5r7h2Dp0t03Fc1cmYEcPGd5lsoW4Qb/NYmBdamf0OU= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035 h1:LIsFowfCCklhLaq1dhN0wV1DjAxytMj0c7z3R57BWkA= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035 h1:gmcHY/NnnKI645BIaERUaa7C6MbzZUJp0L38TbytajQ= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035 h1:590KTky/NL5A0NVKxcC5QPy/nAIB2fxE1wEMDN/f6SI= diff --git a/extension/solarwindsapmsettingsextension/go.mod b/extension/solarwindsapmsettingsextension/go.mod index d366d34528fb4..58f32b1a124a6 100644 --- a/extension/solarwindsapmsettingsextension/go.mod +++ b/extension/solarwindsapmsettingsextension/go.mod @@ -46,7 +46,7 @@ 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/configoptional v0.129.1-0.20250708151327-74cb2f311035 // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035 // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250708151327-74cb2f311035 // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250708151327-74cb2f311035 // indirect diff --git a/extension/solarwindsapmsettingsextension/go.sum b/extension/solarwindsapmsettingsextension/go.sum index bdd8cd6f6bbe6..7ed324ee583cc 100644 --- a/extension/solarwindsapmsettingsextension/go.sum +++ b/extension/solarwindsapmsettingsextension/go.sum @@ -89,8 +89,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f31 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035 h1:k2/Q3E8/dVGWU+kNfj5EEx2022XbFAYIEzALeD/b2Fc= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:aAOmM/mSWE2F3A58x4MUw1bYW8TIjVxn5/WfgxRgMu0= -go.opentelemetry.io/collector/config/configoptional v0.129.0 h1:6zcdvQglWrcFhhzcDcPPlWCRJ2OgrqQQIwLGawamxEM= -go.opentelemetry.io/collector/config/configoptional v0.129.0/go.mod h1:H5r7h2Dp0t03Fc1cmYEcPGd5lsoW4Qb/NYmBdamf0OU= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035 h1:LIsFowfCCklhLaq1dhN0wV1DjAxytMj0c7z3R57BWkA= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035 h1:590KTky/NL5A0NVKxcC5QPy/nAIB2fxE1wEMDN/f6SI= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250708151327-74cb2f311035 h1:p4UiE1v92mWYRZ3+HYldOostpXE9mjP37Gz1HNVhKZk= diff --git a/internal/otelarrow/go.mod b/internal/otelarrow/go.mod index 8f513e626bb93..99970cc9f38cd 100644 --- 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.1-0.20250708151327-74cb2f311035 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/go.sum b/internal/otelarrow/go.sum index efc1c9bd87672..85f48526afc5e 100644 --- a/internal/otelarrow/go.sum +++ b/internal/otelarrow/go.sum @@ -147,8 +147,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f31 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035 h1:k2/Q3E8/dVGWU+kNfj5EEx2022XbFAYIEzALeD/b2Fc= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:aAOmM/mSWE2F3A58x4MUw1bYW8TIjVxn5/WfgxRgMu0= -go.opentelemetry.io/collector/config/configoptional v0.129.0 h1:6zcdvQglWrcFhhzcDcPPlWCRJ2OgrqQQIwLGawamxEM= -go.opentelemetry.io/collector/config/configoptional v0.129.0/go.mod h1:H5r7h2Dp0t03Fc1cmYEcPGd5lsoW4Qb/NYmBdamf0OU= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035 h1:LIsFowfCCklhLaq1dhN0wV1DjAxytMj0c7z3R57BWkA= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035 h1:gmcHY/NnnKI645BIaERUaa7C6MbzZUJp0L38TbytajQ= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250708151327-74cb2f311035 h1:LQDlCI8ecje+D5O9i7uAngh/Thl79A+3vYhigMNGZNs= diff --git a/internal/otelarrow/test/e2e_test.go b/internal/otelarrow/test/e2e_test.go index e1a3b384b5a2c..b996e79d060ce 100644 --- 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/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index ad0f9479b9047..e94ecc0996742 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -77,7 +77,7 @@ 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/configoptional v0.129.1-0.20250708151327-74cb2f311035 // 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/consumer/consumererror v0.129.1-0.20250708151327-74cb2f311035 // indirect diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index ab07ad9040a91..f802d7b3b0a8c 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -129,8 +129,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f31 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035 h1:k2/Q3E8/dVGWU+kNfj5EEx2022XbFAYIEzALeD/b2Fc= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:aAOmM/mSWE2F3A58x4MUw1bYW8TIjVxn5/WfgxRgMu0= -go.opentelemetry.io/collector/config/configoptional v0.129.0 h1:6zcdvQglWrcFhhzcDcPPlWCRJ2OgrqQQIwLGawamxEM= -go.opentelemetry.io/collector/config/configoptional v0.129.0/go.mod h1:H5r7h2Dp0t03Fc1cmYEcPGd5lsoW4Qb/NYmBdamf0OU= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035 h1:LIsFowfCCklhLaq1dhN0wV1DjAxytMj0c7z3R57BWkA= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035 h1:gmcHY/NnnKI645BIaERUaa7C6MbzZUJp0L38TbytajQ= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035 h1:590KTky/NL5A0NVKxcC5QPy/nAIB2fxE1wEMDN/f6SI= diff --git a/receiver/envoyalsreceiver/go.mod b/receiver/envoyalsreceiver/go.mod index 7e362d4d22fc1..3f30837f322ff 100644 --- a/receiver/envoyalsreceiver/go.mod +++ b/receiver/envoyalsreceiver/go.mod @@ -61,7 +61,7 @@ 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/configopaque v1.35.1-0.20250708151327-74cb2f311035 // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035 // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035 // 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 diff --git a/receiver/envoyalsreceiver/go.sum b/receiver/envoyalsreceiver/go.sum index eeb5e0215ab41..c47978e9d90ae 100644 --- a/receiver/envoyalsreceiver/go.sum +++ b/receiver/envoyalsreceiver/go.sum @@ -102,8 +102,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f31 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035 h1:k2/Q3E8/dVGWU+kNfj5EEx2022XbFAYIEzALeD/b2Fc= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:aAOmM/mSWE2F3A58x4MUw1bYW8TIjVxn5/WfgxRgMu0= -go.opentelemetry.io/collector/config/configoptional v0.129.0 h1:6zcdvQglWrcFhhzcDcPPlWCRJ2OgrqQQIwLGawamxEM= -go.opentelemetry.io/collector/config/configoptional v0.129.0/go.mod h1:H5r7h2Dp0t03Fc1cmYEcPGd5lsoW4Qb/NYmBdamf0OU= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035 h1:LIsFowfCCklhLaq1dhN0wV1DjAxytMj0c7z3R57BWkA= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035 h1:590KTky/NL5A0NVKxcC5QPy/nAIB2fxE1wEMDN/f6SI= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250708151327-74cb2f311035 h1:p4UiE1v92mWYRZ3+HYldOostpXE9mjP37Gz1HNVhKZk= diff --git a/receiver/jaegerreceiver/config_test.go b/receiver/jaegerreceiver/config_test.go index ad0c553af7f00..c485357db4241 100644 --- 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 index 21e16d6e2ab93..57ab7505d46e9 100644 --- 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 index a93d4d36d56b1..aa670f310b45b 100644 --- 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 index 4e9bb34ecb2f1..1799f9427df46 100644 --- 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 index 93d7cfba53c39..e54c53b4e8850 100644 --- 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,7 +135,7 @@ 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, }, @@ -142,7 +143,7 @@ func TestCreateMetrics(t *testing.T) { MinTime: 30 * time.Second, PermitWithoutStream: true, }, - }, + }), }, }, }, diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index 6f7709b77a382..bafecd3e311a5 100644 --- a/receiver/opencensusreceiver/go.mod +++ b/receiver/opencensusreceiver/go.mod @@ -16,6 +16,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/confignet v1.35.1-0.20250708151327-74cb2f311035 + go.opentelemetry.io/collector/config/configoptional v0.129.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 go.opentelemetry.io/collector/confmap/xconfmap v0.129.1-0.20250708151327-74cb2f311035 @@ -70,7 +71,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/configopaque 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/extension/extensionauth v1.35.1-0.20250708151327-74cb2f311035 // indirect diff --git a/receiver/opencensusreceiver/go.sum b/receiver/opencensusreceiver/go.sum index 6dbd728c58d18..9fbc05c0be6a5 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -140,8 +140,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f31 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035 h1:k2/Q3E8/dVGWU+kNfj5EEx2022XbFAYIEzALeD/b2Fc= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:aAOmM/mSWE2F3A58x4MUw1bYW8TIjVxn5/WfgxRgMu0= -go.opentelemetry.io/collector/config/configoptional v0.129.0 h1:6zcdvQglWrcFhhzcDcPPlWCRJ2OgrqQQIwLGawamxEM= -go.opentelemetry.io/collector/config/configoptional v0.129.0/go.mod h1:H5r7h2Dp0t03Fc1cmYEcPGd5lsoW4Qb/NYmBdamf0OU= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035 h1:LIsFowfCCklhLaq1dhN0wV1DjAxytMj0c7z3R57BWkA= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035 h1:590KTky/NL5A0NVKxcC5QPy/nAIB2fxE1wEMDN/f6SI= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250708151327-74cb2f311035 h1:p4UiE1v92mWYRZ3+HYldOostpXE9mjP37Gz1HNVhKZk= diff --git a/receiver/opencensusreceiver/opencensus_test.go b/receiver/opencensusreceiver/opencensus_test.go index c7901be771635..67793ae959a72 100644 --- a/receiver/opencensusreceiver/opencensus_test.go +++ b/receiver/opencensusreceiver/opencensus_test.go @@ -32,6 +32,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/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" @@ -836,11 +837,11 @@ func TestInvalidTLSCredentials(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) cfg := Config{ ServerConfig: configgrpc.ServerConfig{ - TLS: &configtls.ServerConfig{ + TLS: configoptional.Some(configtls.ServerConfig{ Config: configtls.Config{ CertFile: "willfail", }, - }, + }), NetAddr: confignet.AddrConfig{ Endpoint: addr, Transport: "tcp", diff --git a/receiver/otelarrowreceiver/config_test.go b/receiver/otelarrowreceiver/config_test.go index 4be5e79edc9d8..b74f27e1818c7 100644 --- a/receiver/otelarrowreceiver/config_test.go +++ b/receiver/otelarrowreceiver/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "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" @@ -52,17 +53,17 @@ func TestUnmarshalConfig(t *testing.T) { Endpoint: "0.0.0.0:4317", Transport: confignet.TransportTypeTCP, }, - TLS: &configtls.ServerConfig{ + TLS: configoptional.Some(configtls.ServerConfig{ Config: configtls.Config{ CertFile: "test.crt", KeyFile: "test.key", }, - }, + }), MaxRecvMsgSizeMiB: 32, MaxConcurrentStreams: 16, ReadBufferSize: 1024, WriteBufferSize: 1024, - Keepalive: &configgrpc.KeepaliveServerConfig{ + Keepalive: configoptional.Some(configgrpc.KeepaliveServerConfig{ ServerParameters: &configgrpc.KeepaliveServerParameters{ MaxConnectionIdle: 11 * time.Second, MaxConnectionAge: 12 * time.Second, @@ -74,7 +75,7 @@ func TestUnmarshalConfig(t *testing.T) { MinTime: 10 * time.Second, PermitWithoutStream: true, }, - }, + }), }, Arrow: ArrowConfig{ MemoryLimitMiB: 123, diff --git a/receiver/otelarrowreceiver/go.mod b/receiver/otelarrowreceiver/go.mod index 1edbdb70fcb08..91af37f071d89 100644 --- a/receiver/otelarrowreceiver/go.mod +++ b/receiver/otelarrowreceiver/go.mod @@ -15,6 +15,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250708151327-74cb2f311035 go.opentelemetry.io/collector/config/configgrpc v0.129.1-0.20250708151327-74cb2f311035 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035 + go.opentelemetry.io/collector/config/configoptional v0.129.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 go.opentelemetry.io/collector/confmap/xconfmap v0.129.1-0.20250708151327-74cb2f311035 @@ -78,7 +79,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/configopaque v1.35.1-0.20250708151327-74cb2f311035 // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250708151327-74cb2f311035 // indirect go.opentelemetry.io/collector/exporter v0.129.1-0.20250708151327-74cb2f311035 // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250708151327-74cb2f311035 // indirect diff --git a/receiver/otelarrowreceiver/go.sum b/receiver/otelarrowreceiver/go.sum index 2a5586d2fc2b3..99fa1211eaab4 100644 --- a/receiver/otelarrowreceiver/go.sum +++ b/receiver/otelarrowreceiver/go.sum @@ -145,8 +145,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f31 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035 h1:k2/Q3E8/dVGWU+kNfj5EEx2022XbFAYIEzALeD/b2Fc= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:aAOmM/mSWE2F3A58x4MUw1bYW8TIjVxn5/WfgxRgMu0= -go.opentelemetry.io/collector/config/configoptional v0.129.0 h1:6zcdvQglWrcFhhzcDcPPlWCRJ2OgrqQQIwLGawamxEM= -go.opentelemetry.io/collector/config/configoptional v0.129.0/go.mod h1:H5r7h2Dp0t03Fc1cmYEcPGd5lsoW4Qb/NYmBdamf0OU= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035 h1:LIsFowfCCklhLaq1dhN0wV1DjAxytMj0c7z3R57BWkA= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035 h1:gmcHY/NnnKI645BIaERUaa7C6MbzZUJp0L38TbytajQ= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250708151327-74cb2f311035 h1:LQDlCI8ecje+D5O9i7uAngh/Thl79A+3vYhigMNGZNs= diff --git a/receiver/otelarrowreceiver/otelarrow.go b/receiver/otelarrowreceiver/otelarrow.go index 9a4033c7a4dd2..16ae33676e567 100644 --- a/receiver/otelarrowreceiver/otelarrow.go +++ b/receiver/otelarrowreceiver/otelarrow.go @@ -128,8 +128,8 @@ func (r *otelArrowReceiver) startProtocolServers(ctx context.Context, host compo } var authServer extensionauth.Server - if r.cfg.GRPC.Auth != nil { - authServer, err = r.cfg.GRPC.Auth.GetServerAuthenticator(ctx, host.GetExtensions()) + if r.cfg.GRPC.Auth.HasValue() { + authServer, err = r.cfg.GRPC.Auth.Get().GetServerAuthenticator(ctx, host.GetExtensions()) if err != nil { return err } diff --git a/receiver/otelarrowreceiver/otelarrow_test.go b/receiver/otelarrowreceiver/otelarrow_test.go index 2f60ed08b1146..29fa828c3196d 100644 --- a/receiver/otelarrowreceiver/otelarrow_test.go +++ b/receiver/otelarrowreceiver/otelarrow_test.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/config/configauth" "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/consumer" "go.opentelemetry.io/collector/consumer/consumertest" @@ -187,11 +188,11 @@ func TestGRPCInvalidTLSCredentials(t *testing.T) { Endpoint: testutil.GetAvailableLocalAddress(t), Transport: confignet.TransportTypeTCP, }, - TLS: &configtls.ServerConfig{ + TLS: configoptional.Some(configtls.ServerConfig{ Config: configtls.Config{ CertFile: "willfail", }, - }, + }), }, }, } @@ -355,12 +356,12 @@ func TestOTelArrowShutdown(t *testing.T) { // Create OTelArrow receiver factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPC.Keepalive = &configgrpc.KeepaliveServerConfig{ + cfg.GRPC.Keepalive = configoptional.Some(configgrpc.KeepaliveServerConfig{ ServerParameters: &configgrpc.KeepaliveServerParameters{}, - } + }) if !cooperative { - cfg.GRPC.Keepalive.ServerParameters.MaxConnectionAge = time.Second - cfg.GRPC.Keepalive.ServerParameters.MaxConnectionAgeGrace = 5 * time.Second + cfg.GRPC.Keepalive.Get().ServerParameters.MaxConnectionAge = time.Second + cfg.GRPC.Keepalive.Get().ServerParameters.MaxConnectionAgeGrace = 5 * time.Second } cfg.GRPC.NetAddr.Endpoint = endpointGrpc set := receivertest.NewNopSettings(componentmetadata.Type) @@ -692,9 +693,9 @@ func TestGRPCArrowReceiverAuth(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.GRPC.NetAddr.Endpoint = addr cfg.GRPC.IncludeMetadata = true - cfg.GRPC.Auth = &configauth.Config{ + cfg.GRPC.Auth = configoptional.Some(configauth.Config{ AuthenticatorID: authID, - } + }) id := component.NewID(componentmetadata.Type) tt := componenttest.NewNopTelemetrySettings() ocr := newReceiver(t, factory, tt, cfg, id, sink, nil) @@ -855,9 +856,9 @@ func TestOTelArrowHalfOpenShutdown(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPC.Keepalive = &configgrpc.KeepaliveServerConfig{ + cfg.GRPC.Keepalive = configoptional.Some(configgrpc.KeepaliveServerConfig{ ServerParameters: &configgrpc.KeepaliveServerParameters{}, - } + }) // No keepalive parameters are set cfg.GRPC.NetAddr.Endpoint = endpointGrpc set := receivertest.NewNopSettings(componentmetadata.Type) diff --git a/receiver/skywalkingreceiver/factory_test.go b/receiver/skywalkingreceiver/factory_test.go index f8be401e8ade2..3f6a254a31e06 100644 --- a/receiver/skywalkingreceiver/factory_test.go +++ b/receiver/skywalkingreceiver/factory_test.go @@ -109,12 +109,12 @@ func TestCreateTLSGPRCEndpoint(t *testing.T) { Endpoint: "0.0.0.0:11800", 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) traceSink := new(consumertest.TracesSink) diff --git a/receiver/stefreceiver/config_test.go b/receiver/stefreceiver/config_test.go index 7405a25055954..92993faaae822 100644 --- a/receiver/stefreceiver/config_test.go +++ b/receiver/stefreceiver/config_test.go @@ -9,6 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -31,8 +32,8 @@ func TestConfig(t *testing.T) { expectedConfig: func() *Config { cfg := createDefaultConfig().(*Config) tls := configtls.NewDefaultServerConfig() - cfg.TLS = &tls - cfg.TLS.KeyFile = "server.key" + cfg.TLS = configoptional.Some(tls) + cfg.TLS.Get().KeyFile = "server.key" return cfg }(), }, diff --git a/receiver/stefreceiver/go.mod b/receiver/stefreceiver/go.mod index e825c24efccbb..f6811f84f1b52 100644 --- a/receiver/stefreceiver/go.mod +++ b/receiver/stefreceiver/go.mod @@ -14,6 +14,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/confignet v1.35.1-0.20250708151327-74cb2f311035 + go.opentelemetry.io/collector/config/configoptional v0.129.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 go.opentelemetry.io/collector/consumer v1.35.1-0.20250708151327-74cb2f311035 @@ -63,7 +64,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/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/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/receiver/stefreceiver/go.sum b/receiver/stefreceiver/go.sum index 29866a83ab2f4..6fd1f37cf3d15 100644 --- a/receiver/stefreceiver/go.sum +++ b/receiver/stefreceiver/go.sum @@ -106,8 +106,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f31 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035 h1:k2/Q3E8/dVGWU+kNfj5EEx2022XbFAYIEzALeD/b2Fc= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:aAOmM/mSWE2F3A58x4MUw1bYW8TIjVxn5/WfgxRgMu0= -go.opentelemetry.io/collector/config/configoptional v0.129.0 h1:6zcdvQglWrcFhhzcDcPPlWCRJ2OgrqQQIwLGawamxEM= -go.opentelemetry.io/collector/config/configoptional v0.129.0/go.mod h1:H5r7h2Dp0t03Fc1cmYEcPGd5lsoW4Qb/NYmBdamf0OU= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035 h1:LIsFowfCCklhLaq1dhN0wV1DjAxytMj0c7z3R57BWkA= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250708151327-74cb2f311035/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035 h1:gmcHY/NnnKI645BIaERUaa7C6MbzZUJp0L38TbytajQ= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250708151327-74cb2f311035/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250708151327-74cb2f311035 h1:590KTky/NL5A0NVKxcC5QPy/nAIB2fxE1wEMDN/f6SI=