diff --git a/exporter/alertmanagerexporter/go.mod b/exporter/alertmanagerexporter/go.mod index daf72745c5771..c2ebfe7d8dda6 100644 --- a/exporter/alertmanagerexporter/go.mod +++ b/exporter/alertmanagerexporter/go.mod @@ -57,7 +57,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/alertmanagerexporter/go.sum b/exporter/alertmanagerexporter/go.sum index 093a69695fa3b..d0ab2b0e7b622 100644 --- a/exporter/alertmanagerexporter/go.sum +++ b/exporter/alertmanagerexporter/go.sum @@ -100,8 +100,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/exporter/bmchelixexporter/go.mod b/exporter/bmchelixexporter/go.mod index 88e402633ae2c..0ec5f95365c94 100644 --- a/exporter/bmchelixexporter/go.mod +++ b/exporter/bmchelixexporter/go.mod @@ -51,7 +51,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/bmchelixexporter/go.sum b/exporter/bmchelixexporter/go.sum index 24b8d9f674d57..2d72b31f95fa3 100644 --- a/exporter/bmchelixexporter/go.sum +++ b/exporter/bmchelixexporter/go.sum @@ -94,8 +94,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/exporter/dorisexporter/go.mod b/exporter/dorisexporter/go.mod index 04613943289ae..ea254109bcb9b 100644 --- a/exporter/dorisexporter/go.mod +++ b/exporter/dorisexporter/go.mod @@ -59,7 +59,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/dorisexporter/go.sum b/exporter/dorisexporter/go.sum index bf07de5728fcb..df8fd35bd4f5f 100644 --- a/exporter/dorisexporter/go.sum +++ b/exporter/dorisexporter/go.sum @@ -102,8 +102,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/exporter/elasticsearchexporter/exporter_test.go b/exporter/elasticsearchexporter/exporter_test.go index bae4eac703ef5..0da8bd18a492d 100644 --- a/exporter/elasticsearchexporter/exporter_test.go +++ b/exporter/elasticsearchexporter/exporter_test.go @@ -25,6 +25,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/configopaque" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -2363,7 +2364,7 @@ func TestExporterAuth(t *testing.T) { done := make(chan struct{}, 1) testauthID := component.NewID(component.MustNewType("authtest")) exporter := newUnstartedTestLogsExporter(t, "http://testing.invalid", func(cfg *Config) { - cfg.Auth = &configauth.Config{AuthenticatorID: testauthID} + cfg.Auth = configoptional.Some(configauth.Config{AuthenticatorID: testauthID}) }) err := exporter.Start(context.Background(), &mockHost{ extensions: map[component.ID]component.Component{ @@ -2396,7 +2397,7 @@ func TestExporterBatcher(t *testing.T) { BatcherConfig: batcherCfg, enabledSet: true, } - cfg.Auth = &configauth.Config{AuthenticatorID: testauthID} + cfg.Auth = configoptional.Some(configauth.Config{AuthenticatorID: testauthID}) cfg.Retry.Enabled = false }) err := exporter.Start(context.Background(), &mockHost{ diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index c8a17d06ad1d8..0470dd1d4d77d 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -24,6 +24,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap/xconfmap v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf @@ -84,7 +85,6 @@ require ( go.elastic.co/fastjson v1.5.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index 762488309b355..f1ea0cf857eab 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -160,8 +160,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/exporter/faroexporter/go.mod b/exporter/faroexporter/go.mod index 01f27607275c5..59a53010a12a9 100644 --- a/exporter/faroexporter/go.mod +++ b/exporter/faroexporter/go.mod @@ -64,7 +64,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/faroexporter/go.sum b/exporter/faroexporter/go.sum index 18d3de5e43424..1e2a55db7d16f 100644 --- a/exporter/faroexporter/go.sum +++ b/exporter/faroexporter/go.sum @@ -122,8 +122,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/exporter/honeycombmarkerexporter/go.mod b/exporter/honeycombmarkerexporter/go.mod index cbe94e9f29446..40f737cad9553 100644 --- a/exporter/honeycombmarkerexporter/go.mod +++ b/exporter/honeycombmarkerexporter/go.mod @@ -71,7 +71,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/honeycombmarkerexporter/go.sum b/exporter/honeycombmarkerexporter/go.sum index a6d146f1c328a..09f565b75c31f 100644 --- a/exporter/honeycombmarkerexporter/go.sum +++ b/exporter/honeycombmarkerexporter/go.sum @@ -131,8 +131,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod index 2dc1846dee0dd..dffae57c490cd 100644 --- a/exporter/influxdbexporter/go.mod +++ b/exporter/influxdbexporter/go.mod @@ -57,7 +57,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/influxdbexporter/go.sum b/exporter/influxdbexporter/go.sum index 161cdbf6e96cf..0cff47ecd447b 100644 --- a/exporter/influxdbexporter/go.sum +++ b/exporter/influxdbexporter/go.sum @@ -123,8 +123,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/exporter/logicmonitorexporter/go.mod b/exporter/logicmonitorexporter/go.mod index f0b85a9f3033c..ee41226f0eba0 100644 --- a/exporter/logicmonitorexporter/go.mod +++ b/exporter/logicmonitorexporter/go.mod @@ -55,7 +55,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/logicmonitorexporter/go.sum b/exporter/logicmonitorexporter/go.sum index 2fee18489589d..3332cbbf94548 100644 --- a/exporter/logicmonitorexporter/go.sum +++ b/exporter/logicmonitorexporter/go.sum @@ -96,8 +96,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index 54af02b3016c7..6fb35ba4a868f 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -58,7 +58,7 @@ require ( go.opentelemetry.io/collector/client v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index 084b6f4e6f1f0..af9e53105da63 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -111,8 +111,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index 534df55319c6a..c4a55f1f0212a 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -72,7 +72,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index 76b808d91f9af..15c8b86ff72e8 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -165,8 +165,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/exporter/mezmoexporter/go.mod b/exporter/mezmoexporter/go.mod index ef7dd2dc2ee58..d901eaa53f66d 100644 --- a/exporter/mezmoexporter/go.mod +++ b/exporter/mezmoexporter/go.mod @@ -52,7 +52,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/mezmoexporter/go.sum b/exporter/mezmoexporter/go.sum index 807e7c721a3a6..cb8563ff8bb4b 100644 --- a/exporter/mezmoexporter/go.sum +++ b/exporter/mezmoexporter/go.sum @@ -96,8 +96,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/exporter/opensearchexporter/config_test.go b/exporter/opensearchexporter/config_test.go index eebd4f04a8d95..05cacb3ae36db 100644 --- a/exporter/opensearchexporter/config_test.go +++ b/exporter/opensearchexporter/config_test.go @@ -14,6 +14,7 @@ import ( "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configopaque" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/confmap/xconfmap" @@ -65,7 +66,7 @@ func TestLoadConfig(t *testing.T) { } config.MaxIdleConns = maxIdleConns config.IdleConnTimeout = idleConnTimeout - config.Auth = &configauth.Config{AuthenticatorID: component.MustNewID("sample_basic_auth")} + config.Auth = configoptional.Some(configauth.Config{AuthenticatorID: component.MustNewID("sample_basic_auth")}) }), BackOffConfig: configretry.BackOffConfig{ Enabled: true, diff --git a/exporter/opensearchexporter/go.mod b/exporter/opensearchexporter/go.mod index 3c626b09f42cf..15768d508575c 100644 --- a/exporter/opensearchexporter/go.mod +++ b/exporter/opensearchexporter/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap/xconfmap v0.129.1-0.20250707130321-ac9adbf016bf @@ -37,7 +38,6 @@ require ( go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/client v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/exporter/xexporter v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/opensearchexporter/go.sum b/exporter/opensearchexporter/go.sum index 07cb806c029b6..b4d550937878c 100644 --- a/exporter/opensearchexporter/go.sum +++ b/exporter/opensearchexporter/go.sum @@ -124,8 +124,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/exporter/prometheusexporter/config_test.go b/exporter/prometheusexporter/config_test.go index 85d6cc84146f5..45a0585b17db1 100644 --- a/exporter/prometheusexporter/config_test.go +++ b/exporter/prometheusexporter/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/confmap/xconfmap" @@ -38,13 +39,13 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: "1.2.3.4:1234", - TLS: &configtls.ServerConfig{ + TLS: configoptional.Some(configtls.ServerConfig{ Config: configtls.Config{ CertFile: "certs/server.crt", KeyFile: "certs/server.key", CAFile: "certs/ca.crt", }, - }, + }), }, Namespace: "test-space", ConstLabels: map[string]string{ diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index fc2bef048d826..b6d27eeca1c9c 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -15,6 +15,7 @@ require ( go.opentelemetry.io/collector/component v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/component/componenttest v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap/xconfmap v0.129.1-0.20250707130321-ac9adbf016bf @@ -180,7 +181,6 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/prometheusexporter/go.sum b/exporter/prometheusexporter/go.sum index 846eb59025074..002c0cca38f53 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -534,8 +534,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250707130321-ac9adbf016bf h1:eaOc9cno1vqClo7/ICezJjEiYTjWkpgFBwiKHsCaE1g= diff --git a/exporter/prometheusexporter/prometheus_test.go b/exporter/prometheusexporter/prometheus_test.go index 6b20ab0f9ab42..e40fa6f754f68 100644 --- a/exporter/prometheusexporter/prometheus_test.go +++ b/exporter/prometheusexporter/prometheus_test.go @@ -15,6 +15,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" @@ -105,13 +106,13 @@ func TestPrometheusExporter_WithTLS(t *testing.T) { }, ServerConfig: confighttp.ServerConfig{ Endpoint: addr, - TLS: &configtls.ServerConfig{ + TLS: configoptional.Some(configtls.ServerConfig{ Config: configtls.Config{ CertFile: "./testdata/certs/server.crt", KeyFile: "./testdata/certs/server.key", CAFile: "./testdata/certs/ca.crt", }, - }, + }), }, SendTimestamps: true, MetricExpiration: 120 * time.Minute, diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index bbe3e5c88cfb5..02a3cb29461b7 100644 --- a/exporter/prometheusremotewriteexporter/go.mod +++ b/exporter/prometheusremotewriteexporter/go.mod @@ -99,7 +99,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/prometheusremotewriteexporter/go.sum b/exporter/prometheusremotewriteexporter/go.sum index 80eca943b2fae..fae8a5fa7ab17 100644 --- a/exporter/prometheusremotewriteexporter/go.sum +++ b/exporter/prometheusremotewriteexporter/go.sum @@ -303,8 +303,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/exporter/sematextexporter/go.mod b/exporter/sematextexporter/go.mod index 7ca839de8a47f..f74cd2dc022c9 100644 --- a/exporter/sematextexporter/go.mod +++ b/exporter/sematextexporter/go.mod @@ -57,7 +57,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/sematextexporter/go.sum b/exporter/sematextexporter/go.sum index 03f8ab1ed5e6c..cf1c295e44445 100644 --- a/exporter/sematextexporter/go.sum +++ b/exporter/sematextexporter/go.sum @@ -118,8 +118,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index f75a518c45f14..de914d5b152ad 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -82,7 +82,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/exporter/xexporter v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index ae902861fb12c..3dc360285bb05 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -131,8 +131,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index 9ab78c1f60980..397d4890ae058 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -100,7 +100,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/exporter/xexporter v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index 34fe152e1f51a..76185c1ca83ca 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -172,8 +172,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/exporter/sumologicexporter/config.go b/exporter/sumologicexporter/config.go index 2f30e33b8b5b9..4c78007599897 100644 --- a/exporter/sumologicexporter/config.go +++ b/exporter/sumologicexporter/config.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/configcompression" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -66,9 +67,9 @@ func createDefaultClientConfig() confighttp.ClientConfig { clientConfig := confighttp.NewDefaultClientConfig() clientConfig.Timeout = defaultTimeout clientConfig.Compression = DefaultCompressEncoding - clientConfig.Auth = &configauth.Config{ + clientConfig.Auth = configoptional.Some(configauth.Config{ AuthenticatorID: component.NewID(sumologicextension.NewFactory().Type()), - } + }) return clientConfig } @@ -110,7 +111,7 @@ func (cfg *Config) Validate() error { return fmt.Errorf("unexpected metric format: %s", cfg.MetricFormat) } - if len(cfg.Endpoint) == 0 && cfg.Auth == nil { + if len(cfg.Endpoint) == 0 && !cfg.Auth.HasValue() { return errors.New("no endpoint and no auth extension specified") } diff --git a/exporter/sumologicexporter/exporter.go b/exporter/sumologicexporter/exporter.go index b12fe8b098a42..0073c99df570f 100644 --- a/exporter/sumologicexporter/exporter.go +++ b/exporter/sumologicexporter/exporter.go @@ -15,6 +15,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config/configauth" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -178,7 +180,7 @@ func (se *sumologicexporter) configure(ctx context.Context) error { for _, e := range se.host.GetExtensions() { v, ok := e.(*sumologicextension.SumologicExtension) - if ok && httpSettings.Auth.AuthenticatorID == v.ComponentID() { + if ok && httpSettings.Auth.HasValue() && httpSettings.Auth.Get().AuthenticatorID == v.ComponentID() { ext = v foundSumoExt = true se.foundSumologicExtension = true @@ -188,8 +190,8 @@ func (se *sumologicexporter) configure(ctx context.Context) error { } switch { - case httpSettings.Endpoint == "" && httpSettings.Auth != nil && - httpSettings.Auth.AuthenticatorID.Type() == sumologicextension.NewFactory().Type(): + case httpSettings.Endpoint == "" && httpSettings.Auth.HasValue() && + httpSettings.Auth.Get().AuthenticatorID.Type() == sumologicextension.NewFactory().Type(): // If user specified using sumologicextension as auth but none was // found then return an error. if !foundSumoExt { @@ -197,7 +199,7 @@ func (se *sumologicexporter) configure(ctx context.Context) error { "sumologic was specified as auth extension (named: %q) but "+ "a matching extension was not found in the config, "+ "please re-check the config and/or define the sumologicextension", - httpSettings.Auth.AuthenticatorID.String(), + httpSettings.Auth.Get().AuthenticatorID.String(), ) } @@ -235,8 +237,8 @@ func (se *sumologicexporter) configure(ctx context.Context) error { // Clean authenticator if set to sumologic. // Setting to null in configuration doesn't work, so we have to force it that way. - if httpSettings.Auth != nil && httpSettings.Auth.AuthenticatorID.Type() == sumologicextension.NewFactory().Type() { - httpSettings.Auth = nil + if httpSettings.Auth.HasValue() && httpSettings.Auth.Get().AuthenticatorID.Type() == sumologicextension.NewFactory().Type() { + httpSettings.Auth = configoptional.None[configauth.Config]() } default: return errors.New("no auth extension and no endpoint specified") diff --git a/exporter/sumologicexporter/exporter_test.go b/exporter/sumologicexporter/exporter_test.go index defe5a0246b1a..4c991ae96e284 100644 --- a/exporter/sumologicexporter/exporter_test.go +++ b/exporter/sumologicexporter/exporter_test.go @@ -15,8 +15,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/configcompression" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/exporter/exportertest" @@ -81,7 +83,7 @@ func prepareExporterTest(t *testing.T, cfg *Config, cb []func(w http.ResponseWri }) cfg.Endpoint = testServer.URL - cfg.Auth = nil + cfg.Auth = configoptional.None[configauth.Config]() exp, err := initExporter(cfg, exportertest.NewNopSettings(metadata.Type)) require.NoError(t, err) @@ -498,7 +500,7 @@ func Benchmark_ExporterPushLogs(b *testing.B) { config := createDefaultConfig().(*Config) config.MetricFormat = PrometheusFormat config.LogFormat = TextFormat - config.Auth = nil + config.Auth = configoptional.None[configauth.Config]() config.Compression = configcompression.TypeGzip return config } diff --git a/exporter/sumologicexporter/factory_test.go b/exporter/sumologicexporter/factory_test.go index 48b8bfac8dd35..4dd9d42b2f804 100644 --- a/exporter/sumologicexporter/factory_test.go +++ b/exporter/sumologicexporter/factory_test.go @@ -11,6 +11,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -32,9 +33,9 @@ func TestCreateDefaultConfig(t *testing.T) { clientConfig := confighttp.NewDefaultClientConfig() clientConfig.Timeout = 30 * time.Second clientConfig.Compression = "gzip" - clientConfig.Auth = &configauth.Config{ + clientConfig.Auth = configoptional.Some(configauth.Config{ AuthenticatorID: component.NewID(metadata.Type), - } + }) assert.Equal(t, &Config{ MaxRequestBodySize: 1_048_576, LogFormat: "otlp", diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index fa114607b3585..20ed15893aa97 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf @@ -69,7 +70,6 @@ require ( go.opentelemetry.io/collector/client v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index f089220925d03..fa2c45c067fcf 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -115,8 +115,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/exporter/sumologicexporter/sender_test.go b/exporter/sumologicexporter/sender_test.go index a530048e264a1..46a1777fa0416 100644 --- a/exporter/sumologicexporter/sender_test.go +++ b/exporter/sumologicexporter/sender_test.go @@ -22,7 +22,9 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/configcompression" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" @@ -73,7 +75,7 @@ func prepareSenderTest(t *testing.T, compression configcompression.Type, cb []fu default: cfg.Compression = configcompression.TypeGzip } - cfg.Auth = nil + cfg.Auth = configoptional.None[configauth.Config]() httpSettings := cfg.ClientConfig host := componenttest.NewNopHost() client, err := httpSettings.ToClient(context.Background(), host, componenttest.NewNopTelemetrySettings()) diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index 24314b53ba80f..9a19f2c039bba 100644 --- a/exporter/zipkinexporter/go.mod +++ b/exporter/zipkinexporter/go.mod @@ -62,7 +62,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/exporter/zipkinexporter/go.sum b/exporter/zipkinexporter/go.sum index 60701309eb4c6..1b40b9b8a6c6c 100644 --- a/exporter/zipkinexporter/go.sum +++ b/exporter/zipkinexporter/go.sum @@ -106,8 +106,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/extension/datadogextension/go.mod b/extension/datadogextension/go.mod index 0250a438b1c6a..9367028e08aa4 100644 --- a/extension/datadogextension/go.mod +++ b/extension/datadogextension/go.mod @@ -208,7 +208,7 @@ require ( go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/confmap/xconfmap v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/extension/datadogextension/go.sum b/extension/datadogextension/go.sum index d63278e6f49af..f270e65dfe93e 100644 --- a/extension/datadogextension/go.sum +++ b/extension/datadogextension/go.sum @@ -592,8 +592,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf0 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250707130321-ac9adbf016bf h1:eaOc9cno1vqClo7/ICezJjEiYTjWkpgFBwiKHsCaE1g= diff --git a/extension/healthcheckextension/config_test.go b/extension/healthcheckextension/config_test.go index 54ca39a7b9373..474d42a3ba153 100644 --- a/extension/healthcheckextension/config_test.go +++ b/extension/healthcheckextension/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/confmap/xconfmap" @@ -35,13 +36,13 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:13", - TLS: &configtls.ServerConfig{ + TLS: configoptional.Some(configtls.ServerConfig{ Config: configtls.Config{ CAFile: "/path/to/ca", CertFile: "/path/to/cert", KeyFile: "/path/to/key", }, - }, + }), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), Path: "/", diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index e7c629c72a507..842c9999047b4 100644 --- a/extension/healthcheckextension/go.mod +++ b/extension/healthcheckextension/go.mod @@ -9,6 +9,7 @@ require ( go.opentelemetry.io/collector/component/componentstatus v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/component/componenttest v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap/xconfmap v0.129.1-0.20250707130321-ac9adbf016bf @@ -48,7 +49,6 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/featuregate v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/extension/healthcheckextension/go.sum b/extension/healthcheckextension/go.sum index 7345a41760003..1f807a397f528 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -89,8 +89,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/extension/healthcheckv2extension/config_test.go b/extension/healthcheckv2extension/config_test.go index bad249f4e2d97..2fcd10ce2dabe 100644 --- a/extension/healthcheckv2extension/config_test.go +++ b/extension/healthcheckv2extension/config_test.go @@ -14,6 +14,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" @@ -50,13 +51,13 @@ func TestLoadConfig(t *testing.T) { LegacyConfig: http.LegacyConfig{ ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:13", - TLS: &configtls.ServerConfig{ + TLS: configoptional.Some(configtls.ServerConfig{ Config: configtls.Config{ CAFile: "/path/to/ca", CertFile: "/path/to/cert", KeyFile: "/path/to/key", }, - }, + }), }, CheckCollectorPipeline: &http.CheckCollectorPipelineConfig{ Enabled: false, diff --git a/extension/healthcheckv2extension/go.mod b/extension/healthcheckv2extension/go.mod index 50132e3810df7..a31d3f82bc81d 100644 --- a/extension/healthcheckv2extension/go.mod +++ b/extension/healthcheckv2extension/go.mod @@ -12,6 +12,7 @@ require ( go.opentelemetry.io/collector/config/configgrpc v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap/xconfmap v0.129.1-0.20250707130321-ac9adbf016bf @@ -55,7 +56,6 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/featuregate v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/extension/healthcheckv2extension/go.sum b/extension/healthcheckv2extension/go.sum index 078147e50d685..5251be50d94ce 100644 --- a/extension/healthcheckv2extension/go.sum +++ b/extension/healthcheckv2extension/go.sum @@ -95,8 +95,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf0 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/extension/httpforwarderextension/go.mod b/extension/httpforwarderextension/go.mod index 945477bcd51b7..15eb485eff378 100644 --- a/extension/httpforwarderextension/go.mod +++ b/extension/httpforwarderextension/go.mod @@ -47,7 +47,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/featuregate v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/extension/httpforwarderextension/go.sum b/extension/httpforwarderextension/go.sum index f7a0e1e62c370..3ff78e9a1c18e 100644 --- a/extension/httpforwarderextension/go.sum +++ b/extension/httpforwarderextension/go.sum @@ -89,8 +89,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/extension/jaegerremotesampling/go.mod b/extension/jaegerremotesampling/go.mod index 38c4d14508dc7..e29f7ef508876 100644 --- a/extension/jaegerremotesampling/go.mod +++ b/extension/jaegerremotesampling/go.mod @@ -56,7 +56,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/internal/telemetry v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/extension/jaegerremotesampling/go.sum b/extension/jaegerremotesampling/go.sum index 0b5d0b4c9f8df..9c441d1c79f97 100644 --- a/extension/jaegerremotesampling/go.sum +++ b/extension/jaegerremotesampling/go.sum @@ -103,8 +103,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf0 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/extension/observer/ecstaskobserver/go.mod b/extension/observer/ecstaskobserver/go.mod index 4872173fc43d9..a9d4cf8c9d451 100644 --- a/extension/observer/ecstaskobserver/go.mod +++ b/extension/observer/ecstaskobserver/go.mod @@ -49,7 +49,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/extension/observer/ecstaskobserver/go.sum b/extension/observer/ecstaskobserver/go.sum index 67a682244fc51..eba5c4fe36f2f 100644 --- a/extension/observer/ecstaskobserver/go.sum +++ b/extension/observer/ecstaskobserver/go.sum @@ -93,8 +93,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/extension/remotetapextension/go.mod b/extension/remotetapextension/go.mod index 198fab744d125..c07e6a729a1a9 100644 --- a/extension/remotetapextension/go.mod +++ b/extension/remotetapextension/go.mod @@ -43,7 +43,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/extension/remotetapextension/go.sum b/extension/remotetapextension/go.sum index dbd9c57e8041d..0309265fd3cc5 100644 --- a/extension/remotetapextension/go.sum +++ b/extension/remotetapextension/go.sum @@ -89,8 +89,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/extension/sumologicextension/go.mod b/extension/sumologicextension/go.mod index 4c250d6317532..594607b7de037 100644 --- a/extension/sumologicextension/go.mod +++ b/extension/sumologicextension/go.mod @@ -54,7 +54,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/extension/sumologicextension/go.sum b/extension/sumologicextension/go.sum index 1ac99ec487a1d..05ac4cc5f5b21 100644 --- a/extension/sumologicextension/go.sum +++ b/extension/sumologicextension/go.sum @@ -108,8 +108,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/internal/aws/ecsutil/go.mod b/internal/aws/ecsutil/go.mod index aa239c9092e7d..d5321b110635e 100644 --- a/internal/aws/ecsutil/go.mod +++ b/internal/aws/ecsutil/go.mod @@ -41,9 +41,9 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/confmap v1.35.0 // indirect + go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/featuregate v1.35.1-0.20250707130321-ac9adbf016bf // indirect @@ -58,6 +58,7 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect go.opentelemetry.io/otel/trace v1.37.0 // indirect go.uber.org/multierr v1.11.0 // indirect + go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/crypto v0.39.0 // indirect golang.org/x/net v0.41.0 // indirect golang.org/x/sys v0.33.0 // indirect @@ -66,7 +67,6 @@ require ( google.golang.org/grpc v1.73.0 // indirect google.golang.org/protobuf v1.36.6 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - sigs.k8s.io/yaml v1.4.0 // indirect ) replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../../internal/common diff --git a/internal/aws/ecsutil/go.sum b/internal/aws/ecsutil/go.sum index 5976bd7ccad9f..2c82fc4e5c26d 100644 --- a/internal/aws/ecsutil/go.sum +++ b/internal/aws/ecsutil/go.sum @@ -23,7 +23,6 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs= github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/go-tpm v0.9.5 h1:ocUmnDebX54dnW+MQWGQRbdaAcJELsa6PqZhJ48KwVU= @@ -88,12 +87,12 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= -go.opentelemetry.io/collector/confmap v1.35.0 h1:U4JDATAl4PrKWe9bGHbZkoQXmJXefWgR2DIkFvw8ULQ= -go.opentelemetry.io/collector/confmap v1.35.0/go.mod h1:qX37ExVBa+WU4jWWJCZc7IJ+uBjb58/9oL+/ctF1Bt0= +go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= +go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:taTeLqkfP3tzhZFv4Et036kqiWaKAteJ88f15RiEmOU= go.opentelemetry.io/collector/consumer v1.35.0 h1:mgS42yh1maXBIE65IT4//iOA89BE+7xSUzV8czyevHg= go.opentelemetry.io/collector/consumer v1.35.0/go.mod h1:9sSPX0hDHaHqzR2uSmfLOuFK9v3e9K3HRQ+fydAjOWs= go.opentelemetry.io/collector/extension v1.35.0 h1:MBnBq5HiXbj+HGCGoqRYPK4tp5cC5+7L9bhiO59T/3k= @@ -184,5 +183,3 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= -sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/internal/datadog/go.mod b/internal/datadog/go.mod index 05f694706b3f8..c2256bba6e6e1 100644 --- a/internal/datadog/go.mod +++ b/internal/datadog/go.mod @@ -154,8 +154,8 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect - go.opentelemetry.io/collector/confmap v1.35.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect + go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/internal/datadog/go.sum b/internal/datadog/go.sum index b116460231283..ba68404919119 100644 --- a/internal/datadog/go.sum +++ b/internal/datadog/go.sum @@ -490,14 +490,14 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= -go.opentelemetry.io/collector/confmap v1.35.0 h1:U4JDATAl4PrKWe9bGHbZkoQXmJXefWgR2DIkFvw8ULQ= -go.opentelemetry.io/collector/confmap v1.35.0/go.mod h1:qX37ExVBa+WU4jWWJCZc7IJ+uBjb58/9oL+/ctF1Bt0= +go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= +go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:taTeLqkfP3tzhZFv4Et036kqiWaKAteJ88f15RiEmOU= go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf h1:2IpK/q1PSzmYRycAPGqV29Lw1Z96E9c4koLEIQoIR0U= go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:9sSPX0hDHaHqzR2uSmfLOuFK9v3e9K3HRQ+fydAjOWs= go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf h1:iKu7PpTdsRPsfFXeVGTsdcfZO1ORyf3ujcP3BRxN9u8= diff --git a/pkg/datadog/config/config.go b/pkg/datadog/config/config.go index 14563e29aaa64..9217601ddb1df 100644 --- a/pkg/datadog/config/config.go +++ b/pkg/datadog/config/config.go @@ -170,7 +170,7 @@ func StaticAPIKeyCheck(key string) error { func validateClientConfig(cfg confighttp.ClientConfig) error { var unsupported []string - if cfg.Auth != nil { + if cfg.Auth.HasValue() { unsupported = append(unsupported, "auth") } if cfg.Endpoint != "" { diff --git a/pkg/datadog/config/config_test.go b/pkg/datadog/config/config_test.go index cc20258ae62fa..00b450f891c4a 100644 --- a/pkg/datadog/config/config_test.go +++ b/pkg/datadog/config/config_test.go @@ -16,6 +16,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/confignet" "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" @@ -31,7 +32,7 @@ func TestValidate(t *testing.T) { maxConnPerHost := 250 ty, err := component.NewType("ty") assert.NoError(t, err) - auth := configauth.Config{AuthenticatorID: component.NewID(ty)} + someAuth := configoptional.Some(configauth.Config{AuthenticatorID: component.NewID(ty)}) tests := []struct { name string @@ -188,7 +189,7 @@ func TestValidate(t *testing.T) { ClientConfig: confighttp.ClientConfig{ Endpoint: "endpoint", Compression: "gzip", - Auth: &auth, + Auth: someAuth, Headers: map[string]configopaque.String{"key": "val"}, HTTP2ReadIdleTimeout: 250, HTTP2PingTimeout: 200, diff --git a/pkg/datadog/go.mod b/pkg/datadog/go.mod index 846dba639ab92..2bcb4d1771c9a 100644 --- a/pkg/datadog/go.mod +++ b/pkg/datadog/go.mod @@ -25,6 +25,7 @@ require ( go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf @@ -203,7 +204,6 @@ require ( go.opentelemetry.io/collector/client v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/pkg/datadog/go.sum b/pkg/datadog/go.sum index 8756ada6f0a28..0d27ec0db4e16 100644 --- a/pkg/datadog/go.sum +++ b/pkg/datadog/go.sum @@ -586,8 +586,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf0 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/processor/remotetapprocessor/go.mod b/processor/remotetapprocessor/go.mod index c1e62e9d4b027..913c51ed6754c 100644 --- a/processor/remotetapprocessor/go.mod +++ b/processor/remotetapprocessor/go.mod @@ -55,7 +55,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/processor/remotetapprocessor/go.sum b/processor/remotetapprocessor/go.sum index 3181f7f674d17..9cb777a0b14fd 100644 --- a/processor/remotetapprocessor/go.sum +++ b/processor/remotetapprocessor/go.sum @@ -94,8 +94,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index a349a6afe65fd..1f003c52a3a5f 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -135,7 +135,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/internal/telemetry v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index e8432968efc89..d85adefdd76ea 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -377,8 +377,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/processor/schemaprocessor/go.mod b/processor/schemaprocessor/go.mod index c3c4d399e8544..54cb68bf13ced 100644 --- a/processor/schemaprocessor/go.mod +++ b/processor/schemaprocessor/go.mod @@ -61,7 +61,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/processor/schemaprocessor/go.sum b/processor/schemaprocessor/go.sum index 4f913d930d666..65fa0acd35200 100644 --- a/processor/schemaprocessor/go.sum +++ b/processor/schemaprocessor/go.sum @@ -100,8 +100,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index fbcfb7ab789e8..ce87cb39f14e1 100644 --- a/receiver/apachereceiver/go.mod +++ b/receiver/apachereceiver/go.mod @@ -92,7 +92,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/apachereceiver/go.sum b/receiver/apachereceiver/go.sum index e411540e99f64..6bc2c1029ac00 100644 --- a/receiver/apachereceiver/go.sum +++ b/receiver/apachereceiver/go.sum @@ -168,8 +168,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/apachesparkreceiver/go.mod b/receiver/apachesparkreceiver/go.mod index 498dfc61d080a..cc3957d001950 100644 --- a/receiver/apachesparkreceiver/go.mod +++ b/receiver/apachesparkreceiver/go.mod @@ -91,7 +91,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/apachesparkreceiver/go.sum b/receiver/apachesparkreceiver/go.sum index 5200101e23155..7b0e09bec7788 100644 --- a/receiver/apachesparkreceiver/go.sum +++ b/receiver/apachesparkreceiver/go.sum @@ -168,8 +168,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index 0974b5f3c588e..0ea325939a0d1 100644 --- a/receiver/awscontainerinsightreceiver/go.mod +++ b/receiver/awscontainerinsightreceiver/go.mod @@ -133,7 +133,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index 2d4add185ad1f..ae7b911ddca27 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -270,8 +270,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index be5697ff96a00..78aa7bfd03895 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -57,7 +57,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index c9bed60d7e973..c2cfae3a53ab8 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -100,8 +100,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/awsfirehosereceiver/config_test.go b/receiver/awsfirehosereceiver/config_test.go index f6702ecf17fc5..f7cddf85676a5 100644 --- a/receiver/awsfirehosereceiver/config_test.go +++ b/receiver/awsfirehosereceiver/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/confmap/xconfmap" @@ -41,12 +42,12 @@ func TestLoadConfig(t *testing.T) { AccessKey: "some_access_key", ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:4433", - TLS: &configtls.ServerConfig{ + TLS: configoptional.Some(configtls.ServerConfig{ Config: configtls.Config{ CertFile: "server.crt", KeyFile: "server.key", }, - }, + }), }, }, cfg) }) diff --git a/receiver/awsfirehosereceiver/go.mod b/receiver/awsfirehosereceiver/go.mod index 5f172cb2484b5..861f964c42ea3 100644 --- a/receiver/awsfirehosereceiver/go.mod +++ b/receiver/awsfirehosereceiver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap/xconfmap v0.129.1-0.20250707130321-ac9adbf016bf @@ -61,7 +62,6 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/awsfirehosereceiver/go.sum b/receiver/awsfirehosereceiver/go.sum index c05f152d9a1f0..e977605a09753 100644 --- a/receiver/awsfirehosereceiver/go.sum +++ b/receiver/awsfirehosereceiver/go.sum @@ -100,8 +100,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/bigipreceiver/go.mod b/receiver/bigipreceiver/go.mod index d68bddc967e61..dc85a9336e281 100644 --- a/receiver/bigipreceiver/go.mod +++ b/receiver/bigipreceiver/go.mod @@ -93,7 +93,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/bigipreceiver/go.sum b/receiver/bigipreceiver/go.sum index 5200101e23155..7b0e09bec7788 100644 --- a/receiver/bigipreceiver/go.sum +++ b/receiver/bigipreceiver/go.sum @@ -168,8 +168,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/cloudfoundryreceiver/go.mod b/receiver/cloudfoundryreceiver/go.mod index 29a202eadf8be..f23bda59d3f7d 100644 --- a/receiver/cloudfoundryreceiver/go.mod +++ b/receiver/cloudfoundryreceiver/go.mod @@ -60,7 +60,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/cloudfoundryreceiver/go.sum b/receiver/cloudfoundryreceiver/go.sum index 2951d5f16040f..1a356f4c0b733 100644 --- a/receiver/cloudfoundryreceiver/go.sum +++ b/receiver/cloudfoundryreceiver/go.sum @@ -135,8 +135,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index c64e058bd3406..d1a86a1e99bd3 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -58,7 +58,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index 929c99f7d4b22..5ae044ddfd576 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -96,8 +96,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/couchdbreceiver/go.mod b/receiver/couchdbreceiver/go.mod index 19485f28c1e0f..7fb58af07bd18 100644 --- a/receiver/couchdbreceiver/go.mod +++ b/receiver/couchdbreceiver/go.mod @@ -61,7 +61,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/couchdbreceiver/go.sum b/receiver/couchdbreceiver/go.sum index a2a1af080b701..974a0fccda70b 100644 --- a/receiver/couchdbreceiver/go.sum +++ b/receiver/couchdbreceiver/go.sum @@ -96,8 +96,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/datadogreceiver/go.mod b/receiver/datadogreceiver/go.mod index 6a93507572363..f38412ce2384c 100644 --- a/receiver/datadogreceiver/go.mod +++ b/receiver/datadogreceiver/go.mod @@ -109,7 +109,7 @@ require ( go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/datadogreceiver/go.sum b/receiver/datadogreceiver/go.sum index bdaf551842170..9355aa609e77d 100644 --- a/receiver/datadogreceiver/go.sum +++ b/receiver/datadogreceiver/go.sum @@ -227,8 +227,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf0 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/receiver/elasticsearchreceiver/config_test.go b/receiver/elasticsearchreceiver/config_test.go index 72c9ac9d18725..34fbfdbbadb3b 100644 --- a/receiver/elasticsearchreceiver/config_test.go +++ b/receiver/elasticsearchreceiver/config_test.go @@ -13,8 +13,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configopaque" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/scraper/scraperhelper" @@ -189,7 +191,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) assert.NoError(t, xconfmap.Validate(cfg)) - if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(metadata.MetricConfig{}), cmpopts.IgnoreUnexported(metadata.ResourceAttributeConfig{})); diff != "" { + if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(metadata.MetricConfig{}), cmpopts.IgnoreUnexported(configoptional.Optional[configauth.Config]{}), cmpopts.IgnoreUnexported(metadata.ResourceAttributeConfig{})); diff != "" { t.Errorf("Config mismatch (-expected +actual):\n%s", diff) } }) diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod index fc8fceca38d7e..ffc07146c4c9c 100644 --- a/receiver/elasticsearchreceiver/go.mod +++ b/receiver/elasticsearchreceiver/go.mod @@ -12,8 +12,10 @@ require ( github.com/testcontainers/testcontainers-go v0.37.0 go.opentelemetry.io/collector/component v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/component/componenttest v0.129.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap/xconfmap v0.129.1-0.20250707130321-ac9adbf016bf @@ -90,10 +92,8 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/client v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/elasticsearchreceiver/go.sum b/receiver/elasticsearchreceiver/go.sum index e411540e99f64..6bc2c1029ac00 100644 --- a/receiver/elasticsearchreceiver/go.sum +++ b/receiver/elasticsearchreceiver/go.sum @@ -168,8 +168,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/expvarreceiver/config_test.go b/receiver/expvarreceiver/config_test.go index 3d14b69afa49e..3657437610f28 100644 --- a/receiver/expvarreceiver/config_test.go +++ b/receiver/expvarreceiver/config_test.go @@ -13,7 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/scraper/scraperhelper" @@ -83,7 +85,7 @@ func TestLoadConfig(t *testing.T) { return } assert.NoError(t, xconfmap.Validate(cfg)) - if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(metadata.MetricConfig{})); diff != "" { + if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(metadata.MetricConfig{}), cmpopts.IgnoreUnexported(configoptional.Optional[configauth.Config]{})); diff != "" { t.Errorf("Config mismatch (-expected +actual):\n%s", diff) } }) diff --git a/receiver/expvarreceiver/go.mod b/receiver/expvarreceiver/go.mod index 27acea8c6f63d..0206d387ba2a0 100644 --- a/receiver/expvarreceiver/go.mod +++ b/receiver/expvarreceiver/go.mod @@ -9,7 +9,9 @@ require ( github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector/component v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/component/componenttest v0.129.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap/xconfmap v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf @@ -53,11 +55,9 @@ require ( github.com/rs/cors v1.11.1 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/client v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/expvarreceiver/go.sum b/receiver/expvarreceiver/go.sum index 01d5c3b6b160e..e1fb98bda3d18 100644 --- a/receiver/expvarreceiver/go.sum +++ b/receiver/expvarreceiver/go.sum @@ -94,8 +94,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/faroreceiver/config_test.go b/receiver/faroreceiver/config_test.go index 8d23d45090168..b81974430f209 100644 --- a/receiver/faroreceiver/config_test.go +++ b/receiver/faroreceiver/config_test.go @@ -10,6 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" ) @@ -33,16 +34,16 @@ func TestUnmarshalConfig(t *testing.T) { &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8080", - TLS: &configtls.ServerConfig{ + TLS: configoptional.Some(configtls.ServerConfig{ Config: configtls.Config{ CertFile: "test.crt", KeyFile: "test.key", }, - }, - CORS: &confighttp.CORSConfig{ + }), + CORS: configoptional.Some(confighttp.CORSConfig{ AllowedOrigins: []string{"https://*.test.com", "https://test.com"}, MaxAge: 7200, - }, + }), }, }, cfg) } diff --git a/receiver/faroreceiver/go.mod b/receiver/faroreceiver/go.mod index c238ca11b858f..638914009c520 100644 --- a/receiver/faroreceiver/go.mod +++ b/receiver/faroreceiver/go.mod @@ -7,6 +7,7 @@ require ( github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector/component/componentstatus v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/receiver/receiverhelper v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/receiver/receivertest v0.129.1-0.20250707130321-ac9adbf016bf @@ -45,7 +46,6 @@ require ( github.com/zeebo/xxh3 v1.0.2 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/featuregate v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/faroreceiver/go.sum b/receiver/faroreceiver/go.sum index ecebbeb2999a0..ca455a3ac191b 100644 --- a/receiver/faroreceiver/go.sum +++ b/receiver/faroreceiver/go.sum @@ -122,8 +122,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/faroreceiver/receiver.go b/receiver/faroreceiver/receiver.go index 2ecdefcb030ff..52d69b61f59bb 100644 --- a/receiver/faroreceiver/receiver.go +++ b/receiver/faroreceiver/receiver.go @@ -40,7 +40,7 @@ func newFaroReceiver(cfg *Config, set *receiver.Settings) (*faroReceiver, error) } transport := "http" - if cfg.TLS != nil { + if cfg.TLS.HasValue() { transport = "https" } diff --git a/receiver/flinkmetricsreceiver/go.mod b/receiver/flinkmetricsreceiver/go.mod index 44f7fb5d59ec1..0daa0cb1f1be0 100644 --- a/receiver/flinkmetricsreceiver/go.mod +++ b/receiver/flinkmetricsreceiver/go.mod @@ -59,7 +59,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/flinkmetricsreceiver/go.sum b/receiver/flinkmetricsreceiver/go.sum index 9c94902f8ce13..d4ef7baa981f6 100644 --- a/receiver/flinkmetricsreceiver/go.sum +++ b/receiver/flinkmetricsreceiver/go.sum @@ -96,8 +96,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/githubreceiver/go.mod b/receiver/githubreceiver/go.mod index 28c203e03f2e9..47f8bc404b782 100644 --- a/receiver/githubreceiver/go.mod +++ b/receiver/githubreceiver/go.mod @@ -87,7 +87,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/confmap/provider/envprovider v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/githubreceiver/go.sum b/receiver/githubreceiver/go.sum index b733264240454..39bfb6e1ca129 100644 --- a/receiver/githubreceiver/go.sum +++ b/receiver/githubreceiver/go.sum @@ -157,8 +157,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.0 h1:RVgIDmhcDqxF3U1vw+Klk4wI5Xu2Pj80jvMwU30ku+M= go.opentelemetry.io/collector/config/configretry v1.35.0/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250707130321-ac9adbf016bf h1:eaOc9cno1vqClo7/ICezJjEiYTjWkpgFBwiKHsCaE1g= diff --git a/receiver/githubreceiver/trace_receiver.go b/receiver/githubreceiver/trace_receiver.go index 7237e2126b6b9..5af34665c6f92 100644 --- a/receiver/githubreceiver/trace_receiver.go +++ b/receiver/githubreceiver/trace_receiver.go @@ -47,7 +47,7 @@ func newTracesReceiver( } transport := "http" - if config.WebHook.TLS != nil { + if config.WebHook.TLS.HasValue() { transport = "https" } diff --git a/receiver/gitlabreceiver/go.mod b/receiver/gitlabreceiver/go.mod index 4f6f98e1d76a7..fcd76ff082317 100644 --- a/receiver/gitlabreceiver/go.mod +++ b/receiver/gitlabreceiver/go.mod @@ -47,7 +47,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/confmap/provider/envprovider v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/confmap/provider/fileprovider v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/confmap/provider/httpprovider v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/gitlabreceiver/go.sum b/receiver/gitlabreceiver/go.sum index 9f7c8f0fcfff1..c1b23f4485cfc 100644 --- a/receiver/gitlabreceiver/go.sum +++ b/receiver/gitlabreceiver/go.sum @@ -160,8 +160,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.0 h1:RVgIDmhcDqxF3U1vw+Klk4wI5Xu2Pj80jvMwU30ku+M= go.opentelemetry.io/collector/config/configretry v1.35.0/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250707130321-ac9adbf016bf h1:eaOc9cno1vqClo7/ICezJjEiYTjWkpgFBwiKHsCaE1g= diff --git a/receiver/gitlabreceiver/traces_receiver.go b/receiver/gitlabreceiver/traces_receiver.go index 663d17b184951..b7bb94a62d706 100644 --- a/receiver/gitlabreceiver/traces_receiver.go +++ b/receiver/gitlabreceiver/traces_receiver.go @@ -53,7 +53,7 @@ func newTracesReceiver(settings receiver.Settings, cfg *Config, traceConsumer co } transport := "http" - if cfg.WebHook.TLS != nil { + if cfg.WebHook.TLS.HasValue() { transport = "https" } diff --git a/receiver/haproxyreceiver/go.mod b/receiver/haproxyreceiver/go.mod index 05aedcb6d187b..8e406679ac6e6 100644 --- a/receiver/haproxyreceiver/go.mod +++ b/receiver/haproxyreceiver/go.mod @@ -91,7 +91,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/haproxyreceiver/go.sum b/receiver/haproxyreceiver/go.sum index 5200101e23155..7b0e09bec7788 100644 --- a/receiver/haproxyreceiver/go.sum +++ b/receiver/haproxyreceiver/go.sum @@ -168,8 +168,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/httpcheckreceiver/go.mod b/receiver/httpcheckreceiver/go.mod index 8ce2535fffeed..9a78c21a8aeb5 100644 --- a/receiver/httpcheckreceiver/go.mod +++ b/receiver/httpcheckreceiver/go.mod @@ -58,7 +58,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/httpcheckreceiver/go.sum b/receiver/httpcheckreceiver/go.sum index 081b9871d6c4f..00192d3220dcc 100644 --- a/receiver/httpcheckreceiver/go.sum +++ b/receiver/httpcheckreceiver/go.sum @@ -94,8 +94,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/huaweicloudcesreceiver/go.mod b/receiver/huaweicloudcesreceiver/go.mod index b1ff4d59a62c3..c805383a827f8 100644 --- a/receiver/huaweicloudcesreceiver/go.mod +++ b/receiver/huaweicloudcesreceiver/go.mod @@ -62,7 +62,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/huaweicloudcesreceiver/go.sum b/receiver/huaweicloudcesreceiver/go.sum index 8c674c3f9e038..e391145cb5836 100644 --- a/receiver/huaweicloudcesreceiver/go.sum +++ b/receiver/huaweicloudcesreceiver/go.sum @@ -143,8 +143,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/receiver/influxdbreceiver/go.mod b/receiver/influxdbreceiver/go.mod index 3d2c07d40553d..40e0f9cbd073e 100644 --- a/receiver/influxdbreceiver/go.mod +++ b/receiver/influxdbreceiver/go.mod @@ -64,7 +64,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/influxdbreceiver/go.sum b/receiver/influxdbreceiver/go.sum index 2a994a506a8a4..eea4f92a45ba6 100644 --- a/receiver/influxdbreceiver/go.sum +++ b/receiver/influxdbreceiver/go.sum @@ -139,8 +139,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/jaegerreceiver/factory_test.go b/receiver/jaegerreceiver/factory_test.go index a56e798f7f077..21e16d6e2ab93 100644 --- a/receiver/jaegerreceiver/factory_test.go +++ b/receiver/jaegerreceiver/factory_test.go @@ -15,6 +15,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/pipeline" @@ -122,12 +123,12 @@ func TestCreateTLSThriftHTTPEndpoint(t *testing.T) { cfg.(*Config).ThriftHTTP = &confighttp.ServerConfig{ Endpoint: "0.0.0.0:14268", - 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/go.mod b/receiver/jaegerreceiver/go.mod index dbde0da95938c..b8b895c8ffe83 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -15,6 +15,7 @@ require ( go.opentelemetry.io/collector/config/configgrpc v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap/xconfmap v0.129.1-0.20250707130321-ac9adbf016bf @@ -69,7 +70,6 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/jaegerreceiver/go.sum b/receiver/jaegerreceiver/go.sum index 0f9986b0c391a..b9bf1ca052f89 100644 --- a/receiver/jaegerreceiver/go.sum +++ b/receiver/jaegerreceiver/go.sum @@ -110,8 +110,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf0 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/libhoneyreceiver/go.mod b/receiver/libhoneyreceiver/go.mod index 459aaa50d1057..e0f418e0c4ec9 100644 --- a/receiver/libhoneyreceiver/go.mod +++ b/receiver/libhoneyreceiver/go.mod @@ -32,7 +32,7 @@ require ( github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/libhoneyreceiver/go.sum b/receiver/libhoneyreceiver/go.sum index 20f230c381db6..e5395b52ab754 100644 --- a/receiver/libhoneyreceiver/go.sum +++ b/receiver/libhoneyreceiver/go.sum @@ -98,8 +98,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/lokireceiver/go.mod b/receiver/lokireceiver/go.mod index bd4df2c56e6c7..fc3a07740a28c 100644 --- a/receiver/lokireceiver/go.mod +++ b/receiver/lokireceiver/go.mod @@ -79,7 +79,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/lokireceiver/go.sum b/receiver/lokireceiver/go.sum index 0210575be77de..9fb000beb8fac 100644 --- a/receiver/lokireceiver/go.sum +++ b/receiver/lokireceiver/go.sum @@ -171,8 +171,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf0 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 5b863c37afef9..33af29b094f1a 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -92,7 +92,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index 7917c33c2984b..45b4298f3e473 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -170,8 +170,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/nsxtreceiver/go.mod b/receiver/nsxtreceiver/go.mod index e6b876b283aa9..0a98604c1fbc9 100644 --- a/receiver/nsxtreceiver/go.mod +++ b/receiver/nsxtreceiver/go.mod @@ -61,7 +61,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/nsxtreceiver/go.sum b/receiver/nsxtreceiver/go.sum index 892da90f6d784..7ead6c5b92437 100644 --- a/receiver/nsxtreceiver/go.sum +++ b/receiver/nsxtreceiver/go.sum @@ -102,8 +102,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/pprofreceiver/go.mod b/receiver/pprofreceiver/go.mod index 22fcf2c1cf0a3..3a3ea01affe49 100644 --- a/receiver/pprofreceiver/go.mod +++ b/receiver/pprofreceiver/go.mod @@ -47,7 +47,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/pprofreceiver/go.sum b/receiver/pprofreceiver/go.sum index 2ff355f13d9a4..18ab3c15b245f 100644 --- a/receiver/pprofreceiver/go.sum +++ b/receiver/pprofreceiver/go.sum @@ -92,8 +92,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index 640f09a86ade4..eb8871ca177bb 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -208,7 +208,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/connector v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/prometheusreceiver/go.sum b/receiver/prometheusreceiver/go.sum index 667e74c2dd6dd..760cd211c5c50 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -539,8 +539,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250707130321-ac9adbf016bf h1:eaOc9cno1vqClo7/ICezJjEiYTjWkpgFBwiKHsCaE1g= diff --git a/receiver/prometheusreceiver/metrics_receiver.go b/receiver/prometheusreceiver/metrics_receiver.go index 9b7029eebac01..c07541cc7a82f 100644 --- a/receiver/prometheusreceiver/metrics_receiver.go +++ b/receiver/prometheusreceiver/metrics_receiver.go @@ -242,10 +242,10 @@ func (r *pReceiver) initAPIServer(ctx context.Context, host component.Host) erro // If allowed CORS origins are provided in the receiver config, combine them into a single regex since the Prometheus API server requires this format. var corsOriginRegexp *grafanaRegexp.Regexp - if r.cfg.APIServer.ServerConfig.CORS != nil && len(r.cfg.APIServer.ServerConfig.CORS.AllowedOrigins) > 0 { + if r.cfg.APIServer.ServerConfig.CORS.HasValue() && len(r.cfg.APIServer.ServerConfig.CORS.Get().AllowedOrigins) > 0 { var combinedOriginsBuilder strings.Builder - combinedOriginsBuilder.WriteString(r.cfg.APIServer.ServerConfig.CORS.AllowedOrigins[0]) - for _, origin := range r.cfg.APIServer.ServerConfig.CORS.AllowedOrigins[1:] { + combinedOriginsBuilder.WriteString(r.cfg.APIServer.ServerConfig.CORS.Get().AllowedOrigins[0]) + for _, origin := range r.cfg.APIServer.ServerConfig.CORS.Get().AllowedOrigins[1:] { combinedOriginsBuilder.WriteString("|") combinedOriginsBuilder.WriteString(origin) } diff --git a/receiver/prometheusremotewritereceiver/go.mod b/receiver/prometheusremotewritereceiver/go.mod index 6609ae579c4b0..4734ef76b7441 100644 --- a/receiver/prometheusremotewritereceiver/go.mod +++ b/receiver/prometheusremotewritereceiver/go.mod @@ -87,7 +87,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/confmap/xconfmap v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/prometheusremotewritereceiver/go.sum b/receiver/prometheusremotewritereceiver/go.sum index 14c2670705e39..61f9723267ad3 100644 --- a/receiver/prometheusremotewritereceiver/go.sum +++ b/receiver/prometheusremotewritereceiver/go.sum @@ -308,8 +308,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/purefareceiver/go.mod b/receiver/purefareceiver/go.mod index 56f9b62feb336..fb573e2cdbe7b 100644 --- a/receiver/purefareceiver/go.mod +++ b/receiver/purefareceiver/go.mod @@ -175,7 +175,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/purefareceiver/go.sum b/receiver/purefareceiver/go.sum index 7aa0a6b79872e..7e3401fc8fa0f 100644 --- a/receiver/purefareceiver/go.sum +++ b/receiver/purefareceiver/go.sum @@ -534,8 +534,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250707130321-ac9adbf016bf h1:eaOc9cno1vqClo7/ICezJjEiYTjWkpgFBwiKHsCaE1g= diff --git a/receiver/purefbreceiver/go.mod b/receiver/purefbreceiver/go.mod index 6e550f08b476e..1798f3039907f 100644 --- a/receiver/purefbreceiver/go.mod +++ b/receiver/purefbreceiver/go.mod @@ -174,7 +174,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/purefbreceiver/go.sum b/receiver/purefbreceiver/go.sum index 7aa0a6b79872e..7e3401fc8fa0f 100644 --- a/receiver/purefbreceiver/go.sum +++ b/receiver/purefbreceiver/go.sum @@ -534,8 +534,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250707130321-ac9adbf016bf h1:eaOc9cno1vqClo7/ICezJjEiYTjWkpgFBwiKHsCaE1g= diff --git a/receiver/rabbitmqreceiver/go.mod b/receiver/rabbitmqreceiver/go.mod index 0580fe14c1469..5ba401ca8b6d2 100644 --- a/receiver/rabbitmqreceiver/go.mod +++ b/receiver/rabbitmqreceiver/go.mod @@ -59,7 +59,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/rabbitmqreceiver/go.sum b/receiver/rabbitmqreceiver/go.sum index 9c94902f8ce13..d4ef7baa981f6 100644 --- a/receiver/rabbitmqreceiver/go.sum +++ b/receiver/rabbitmqreceiver/go.sum @@ -96,8 +96,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/riakreceiver/go.mod b/receiver/riakreceiver/go.mod index b0a09050cc0fe..4f7c37d69e893 100644 --- a/receiver/riakreceiver/go.mod +++ b/receiver/riakreceiver/go.mod @@ -60,7 +60,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/riakreceiver/go.sum b/receiver/riakreceiver/go.sum index 9c94902f8ce13..d4ef7baa981f6 100644 --- a/receiver/riakreceiver/go.sum +++ b/receiver/riakreceiver/go.sum @@ -96,8 +96,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/sapmreceiver/config_test.go b/receiver/sapmreceiver/config_test.go index bc883adeda5a1..f27f0fa4b5ae2 100644 --- a/receiver/sapmreceiver/config_test.go +++ b/receiver/sapmreceiver/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/confmap/xconfmap" @@ -45,12 +46,12 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:7276", - TLS: &configtls.ServerConfig{ + TLS: configoptional.Some(configtls.ServerConfig{ Config: configtls.Config{ CertFile: "/test.crt", KeyFile: "/test.key", }, - }, + }), }, }, }, diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index 7430a0fba1cdf..eb624a36275a5 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -15,6 +15,7 @@ require ( go.opentelemetry.io/collector/component/componentstatus v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/component/componenttest v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap/xconfmap v0.129.1-0.20250707130321-ac9adbf016bf @@ -65,7 +66,6 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index e83a85aa6c7a3..e834180746a0b 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -107,8 +107,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/sapmreceiver/trace_receiver.go b/receiver/sapmreceiver/trace_receiver.go index 52137490e8739..fdee13e70094a 100644 --- a/receiver/sapmreceiver/trace_receiver.go +++ b/receiver/sapmreceiver/trace_receiver.go @@ -198,7 +198,7 @@ func newReceiver( } transport := "http" - if config.TLS != nil { + if config.TLS.HasValue() { transport = "https" } obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{ diff --git a/receiver/sapmreceiver/trace_receiver_test.go b/receiver/sapmreceiver/trace_receiver_test.go index 0873e1e09be33..147a0d6856e89 100644 --- a/receiver/sapmreceiver/trace_receiver_test.go +++ b/receiver/sapmreceiver/trace_receiver_test.go @@ -23,6 +23,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componentstatus" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" @@ -318,13 +319,13 @@ func TestReception(t *testing.T) { config: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: tlsAddress, - TLS: &configtls.ServerConfig{ + TLS: configoptional.Some(configtls.ServerConfig{ Config: configtls.Config{ CAFile: "./testdata/ca.crt", CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", }, - }, + }), }, }, sapm: &splunksapm.PostSpansRequest{Batches: []*model.Batch{grpcFixture(now)}}, diff --git a/receiver/signalfxreceiver/config_test.go b/receiver/signalfxreceiver/config_test.go index a9fe58110cda1..bb666d23afc9a 100644 --- a/receiver/signalfxreceiver/config_test.go +++ b/receiver/signalfxreceiver/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/confmap/xconfmap" @@ -49,12 +50,12 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:9943", - TLS: &configtls.ServerConfig{ + TLS: configoptional.Some(configtls.ServerConfig{ Config: configtls.Config{ CertFile: "/test.crt", KeyFile: "/test.key", }, - }, + }), }, AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{ AccessTokenPassthrough: false, diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index e00d196d1091b..3cfe2b647b38a 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -16,6 +16,7 @@ require ( go.opentelemetry.io/collector/component/componentstatus v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/component/componenttest v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap/xconfmap v0.129.1-0.20250707130321-ac9adbf016bf @@ -80,7 +81,6 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index de7ac5c548491..8089483f85e13 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -135,8 +135,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/receiver/signalfxreceiver/receiver.go b/receiver/signalfxreceiver/receiver.go index 7da7f0af2bec3..96fe5220f0896 100644 --- a/receiver/signalfxreceiver/receiver.go +++ b/receiver/signalfxreceiver/receiver.go @@ -92,7 +92,7 @@ func newReceiver( config Config, ) (*sfxReceiver, error) { transport := "http" - if config.TLS != nil { + if config.TLS.HasValue() { transport = "https" } obsrecv, err := receiverhelper.NewObsReport(receiverhelper.ObsReportSettings{ diff --git a/receiver/signalfxreceiver/receiver_test.go b/receiver/signalfxreceiver/receiver_test.go index ca0a18853d189..38bcb1531b4e5 100644 --- a/receiver/signalfxreceiver/receiver_test.go +++ b/receiver/signalfxreceiver/receiver_test.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/collector/component/componentstatus" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" @@ -621,12 +622,12 @@ func Test_sfxReceiver_TLS(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) cfg := createDefaultConfig().(*Config) cfg.Endpoint = addr - cfg.TLS = &configtls.ServerConfig{ + cfg.TLS = configoptional.Some(configtls.ServerConfig{ Config: configtls.Config{ CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", }, - } + }) sink := new(consumertest.MetricsSink) cs := receivertest.NewNopSettings(metadata.Type) r, err := newReceiver(cs, *cfg) diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index 0bc8cc26d1622..54d1fd64b2af2 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -172,7 +172,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index 7aa0a6b79872e..7e3401fc8fa0f 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -534,8 +534,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtelemetry v0.129.1-0.20250707130321-ac9adbf016bf h1:eaOc9cno1vqClo7/ICezJjEiYTjWkpgFBwiKHsCaE1g= diff --git a/receiver/skywalkingreceiver/factory_test.go b/receiver/skywalkingreceiver/factory_test.go index 37045092156d1..f8be401e8ade2 100644 --- a/receiver/skywalkingreceiver/factory_test.go +++ b/receiver/skywalkingreceiver/factory_test.go @@ -15,6 +15,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/consumer/consumertest" @@ -127,12 +128,12 @@ func TestCreateTLSHTTPEndpoint(t *testing.T) { cfg.(*Config).HTTP = &confighttp.ServerConfig{ Endpoint: "0.0.0.0:12800", - 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/skywalkingreceiver/go.mod b/receiver/skywalkingreceiver/go.mod index 627666638c29b..5918a5be1f671 100644 --- a/receiver/skywalkingreceiver/go.mod +++ b/receiver/skywalkingreceiver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/config/configgrpc v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap/xconfmap v0.129.1-0.20250707130321-ac9adbf016bf @@ -63,7 +64,6 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/skywalkingreceiver/go.sum b/receiver/skywalkingreceiver/go.sum index c9289eb447381..34a41cbd011b0 100644 --- a/receiver/skywalkingreceiver/go.sum +++ b/receiver/skywalkingreceiver/go.sum @@ -151,8 +151,8 @@ go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf0 go.opentelemetry.io/collector/config/confignet v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:HgpLwdRLzPTwbjpUXR0Wdt6pAHuYzaIr8t4yECKrEvo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/splunkenterprisereceiver/client_test.go b/receiver/splunkenterprisereceiver/client_test.go index 1a5651c39591f..46b850f3256d6 100644 --- a/receiver/splunkenterprisereceiver/client_test.go +++ b/receiver/splunkenterprisereceiver/client_test.go @@ -17,6 +17,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest" "go.opentelemetry.io/collector/scraper/scraperhelper" ) @@ -36,7 +37,7 @@ func TestClientCreation(t *testing.T) { cfg := &Config{ IdxEndpoint: confighttp.ClientConfig{ Endpoint: "https://localhost:8089", - Auth: &configauth.Config{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}, + Auth: configoptional.Some(configauth.Config{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}), }, ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, @@ -65,7 +66,7 @@ func TestClientCreateRequest(t *testing.T) { cfg := &Config{ IdxEndpoint: confighttp.ClientConfig{ Endpoint: "https://localhost:8089", - Auth: &configauth.Config{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}, + Auth: configoptional.Some(configauth.Config{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}), }, ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, @@ -144,7 +145,7 @@ func TestAPIRequestCreate(t *testing.T) { cfg := &Config{ IdxEndpoint: confighttp.ClientConfig{ Endpoint: "https://localhost:8089", - Auth: &configauth.Config{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}, + Auth: configoptional.Some(configauth.Config{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}), }, ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, diff --git a/receiver/splunkenterprisereceiver/config.go b/receiver/splunkenterprisereceiver/config.go index 6d799a14c3d16..ed42b24789c03 100644 --- a/receiver/splunkenterprisereceiver/config.go +++ b/receiver/splunkenterprisereceiver/config.go @@ -42,19 +42,19 @@ func (cfg *Config) Validate() (errors error) { errors = multierr.Append(errors, errBadOrMissingEndpoint) } else { if cfg.IdxEndpoint.Endpoint != "" { - if cfg.IdxEndpoint.Auth == nil { + if !cfg.IdxEndpoint.Auth.HasValue() { errors = multierr.Append(errors, errMissingAuthExtension) } endpoints = append(endpoints, cfg.IdxEndpoint.Endpoint) } if cfg.SHEndpoint.Endpoint != "" { - if cfg.SHEndpoint.Auth == nil { + if !cfg.SHEndpoint.Auth.HasValue() { errors = multierr.Append(errors, errMissingAuthExtension) } endpoints = append(endpoints, cfg.SHEndpoint.Endpoint) } if cfg.CMEndpoint.Endpoint != "" { - if cfg.CMEndpoint.Auth == nil { + if !cfg.CMEndpoint.Auth.HasValue() { errors = multierr.Append(errors, errMissingAuthExtension) } endpoints = append(endpoints, cfg.CMEndpoint.Endpoint) diff --git a/receiver/splunkenterprisereceiver/config_test.go b/receiver/splunkenterprisereceiver/config_test.go index fa9d96539ab5d..45c8f78480971 100644 --- a/receiver/splunkenterprisereceiver/config_test.go +++ b/receiver/splunkenterprisereceiver/config_test.go @@ -11,6 +11,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/confmap/confmaptest" "go.uber.org/multierr" @@ -52,13 +53,13 @@ func TestEndpointCorrectness(t *testing.T) { expected: errBad, config: &Config{ IdxEndpoint: confighttp.ClientConfig{ - Auth: &configauth.Config{AuthenticatorID: dummyID}, + Auth: configoptional.Some(configauth.Config{AuthenticatorID: dummyID}), }, SHEndpoint: confighttp.ClientConfig{ - Auth: &configauth.Config{AuthenticatorID: dummyID}, + Auth: configoptional.Some(configauth.Config{AuthenticatorID: dummyID}), }, CMEndpoint: confighttp.ClientConfig{ - Auth: &configauth.Config{AuthenticatorID: dummyID}, + Auth: configoptional.Some(configauth.Config{AuthenticatorID: dummyID}), }, }, }, @@ -67,7 +68,7 @@ func TestEndpointCorrectness(t *testing.T) { expected: errBad, config: &Config{ IdxEndpoint: confighttp.ClientConfig{ - Auth: &configauth.Config{AuthenticatorID: dummyID}, + Auth: configoptional.Some(configauth.Config{AuthenticatorID: dummyID}), Endpoint: "123.321.12.1:1", }, }, @@ -77,7 +78,7 @@ func TestEndpointCorrectness(t *testing.T) { expected: errScheme, config: &Config{ IdxEndpoint: confighttp.ClientConfig{ - Auth: &configauth.Config{AuthenticatorID: dummyID}, + Auth: configoptional.Some(configauth.Config{AuthenticatorID: dummyID}), Endpoint: "gss://123.124.32.12:90", }, }, diff --git a/receiver/splunkenterprisereceiver/go.mod b/receiver/splunkenterprisereceiver/go.mod index e8b04893d7f4d..dbae123472591 100644 --- a/receiver/splunkenterprisereceiver/go.mod +++ b/receiver/splunkenterprisereceiver/go.mod @@ -12,6 +12,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/consumer/consumertest v0.129.1-0.20250707130321-ac9adbf016bf @@ -58,7 +59,6 @@ require ( go.opentelemetry.io/collector/client v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/splunkenterprisereceiver/go.sum b/receiver/splunkenterprisereceiver/go.sum index 15653a9e42728..bc265a75aced2 100644 --- a/receiver/splunkenterprisereceiver/go.sum +++ b/receiver/splunkenterprisereceiver/go.sum @@ -94,8 +94,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/splunkenterprisereceiver/scraper_test.go b/receiver/splunkenterprisereceiver/scraper_test.go index 5c94ac0696fd2..bcd94fcde11b5 100644 --- a/receiver/splunkenterprisereceiver/scraper_test.go +++ b/receiver/splunkenterprisereceiver/scraper_test.go @@ -16,6 +16,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest" "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/scraper/scrapererror" @@ -108,15 +109,15 @@ func createConfig(ts *httptest.Server, badConfig bool) *Config { return &Config{ IdxEndpoint: confighttp.ClientConfig{ Endpoint: endpoint, - Auth: &configauth.Config{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}, + Auth: configoptional.Some(configauth.Config{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}), }, SHEndpoint: confighttp.ClientConfig{ Endpoint: endpoint, - Auth: &configauth.Config{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}, + Auth: configoptional.Some(configauth.Config{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}), }, CMEndpoint: confighttp.ClientConfig{ Endpoint: endpoint, - Auth: &configauth.Config{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}, + Auth: configoptional.Some(configauth.Config{AuthenticatorID: component.MustNewIDWithName("basicauth", "client")}), }, ControllerConfig: scraperhelper.ControllerConfig{ CollectionInterval: 10 * time.Second, diff --git a/receiver/splunkhecreceiver/config_test.go b/receiver/splunkhecreceiver/config_test.go index e9983985622ed..d068784654582 100644 --- a/receiver/splunkhecreceiver/config_test.go +++ b/receiver/splunkhecreceiver/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" "go.opentelemetry.io/collector/confmap/xconfmap" @@ -59,12 +60,12 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8088", - TLS: &configtls.ServerConfig{ + TLS: configoptional.Some(configtls.ServerConfig{ Config: configtls.Config{ CertFile: "/test.crt", KeyFile: "/test.key", }, - }, + }), }, AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{ AccessTokenPassthrough: false, diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index dbe8caf4c994c..3a28a7d133405 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -17,6 +17,7 @@ require ( go.opentelemetry.io/collector/component/componentstatus v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/component/componenttest v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/confighttp v0.129.1-0.20250707130321-ac9adbf016bf + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf go.opentelemetry.io/collector/confmap/xconfmap v0.129.1-0.20250707130321-ac9adbf016bf @@ -69,7 +70,6 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index 8c0a3b69db04e..097ddec78453c 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -168,8 +168,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= diff --git a/receiver/splunkhecreceiver/receiver.go b/receiver/splunkhecreceiver/receiver.go index 779781c4e8747..ec28b8c9dd6bf 100644 --- a/receiver/splunkhecreceiver/receiver.go +++ b/receiver/splunkhecreceiver/receiver.go @@ -106,7 +106,7 @@ func newReceiver(settings receiver.Settings, config Config) (*splunkReceiver, er } transport := "http" - if config.TLS != nil { + if config.TLS.HasValue() { transport = "https" } diff --git a/receiver/splunkhecreceiver/receiver_test.go b/receiver/splunkhecreceiver/receiver_test.go index 42cf0fa51f701..1d990ad66c897 100644 --- a/receiver/splunkhecreceiver/receiver_test.go +++ b/receiver/splunkhecreceiver/receiver_test.go @@ -24,6 +24,7 @@ import ( "go.opentelemetry.io/collector/component/componentstatus" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configoptional" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" @@ -398,12 +399,12 @@ func Test_splunkhecReceiver_TLS(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) cfg := createDefaultConfig().(*Config) cfg.Endpoint = addr - cfg.TLS = &configtls.ServerConfig{ + cfg.TLS = configoptional.Some(configtls.ServerConfig{ Config: configtls.Config{ CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", }, - } + }) sink := new(consumertest.LogsSink) set := receivertest.NewNopSettings(metadata.Type) r, err := newReceiver(set, *cfg) diff --git a/receiver/webhookeventreceiver/go.mod b/receiver/webhookeventreceiver/go.mod index 58bbb2baeb1db..ef841a51190fa 100644 --- a/receiver/webhookeventreceiver/go.mod +++ b/receiver/webhookeventreceiver/go.mod @@ -54,7 +54,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/webhookeventreceiver/go.sum b/receiver/webhookeventreceiver/go.sum index f23098cd54f5e..a7938109f1355 100644 --- a/receiver/webhookeventreceiver/go.sum +++ b/receiver/webhookeventreceiver/go.sum @@ -96,8 +96,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/receiver/webhookeventreceiver/receiver.go b/receiver/webhookeventreceiver/receiver.go index aa5b965ab0771..b82c4d71d1257 100644 --- a/receiver/webhookeventreceiver/receiver.go +++ b/receiver/webhookeventreceiver/receiver.go @@ -62,7 +62,7 @@ func newLogsReceiver(params receiver.Settings, cfg Config, consumer consumer.Log } transport := "http" - if cfg.TLS != nil { + if cfg.TLS.HasValue() { transport = "https" } diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index 4254dce073fe0..6ad5d3fae247d 100644 --- a/receiver/zipkinreceiver/go.mod +++ b/receiver/zipkinreceiver/go.mod @@ -60,7 +60,7 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect diff --git a/receiver/zipkinreceiver/go.sum b/receiver/zipkinreceiver/go.sum index d396abcf67bb0..83174a1b50f46 100644 --- a/receiver/zipkinreceiver/go.sum +++ b/receiver/zipkinreceiver/go.sum @@ -102,8 +102,8 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= diff --git a/testbed/mockdatasenders/mockdatadogagentexporter/go.mod b/testbed/mockdatasenders/mockdatadogagentexporter/go.mod index 0cd9e8bdbbe80..8a99b9702c10f 100644 --- a/testbed/mockdatasenders/mockdatadogagentexporter/go.mod +++ b/testbed/mockdatasenders/mockdatadogagentexporter/go.mod @@ -49,10 +49,10 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/config/configoptional v0.129.0 // indirect + go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf // indirect - go.opentelemetry.io/collector/confmap v1.35.0 // indirect + go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionauth v1.35.1-0.20250707130321-ac9adbf016bf // indirect go.opentelemetry.io/collector/extension/extensionmiddleware v0.129.1-0.20250707130321-ac9adbf016bf // indirect @@ -72,6 +72,7 @@ require ( go.opentelemetry.io/otel/trace v1.37.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect + go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/crypto v0.39.0 // indirect golang.org/x/net v0.41.0 // indirect golang.org/x/sys v0.33.0 // indirect @@ -80,7 +81,6 @@ require ( google.golang.org/grpc v1.73.0 // indirect google.golang.org/protobuf v1.36.6 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - sigs.k8s.io/yaml v1.4.0 // indirect ) retract ( diff --git a/testbed/mockdatasenders/mockdatadogagentexporter/go.sum b/testbed/mockdatasenders/mockdatadogagentexporter/go.sum index 10e27782fbada..91ee4236513b2 100644 --- a/testbed/mockdatasenders/mockdatadogagentexporter/go.sum +++ b/testbed/mockdatasenders/mockdatadogagentexporter/go.sum @@ -42,7 +42,6 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs= github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/go-tpm v0.9.5 h1:ocUmnDebX54dnW+MQWGQRbdaAcJELsa6PqZhJ48KwVU= @@ -129,14 +128,14 @@ go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321- go.opentelemetry.io/collector/config/configmiddleware v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:p+KgXUw5JsTwvY3wh2elfdgQiE8wfKsaXBJVVnrPnMo= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf h1:n+/0UhYyhC262JOHxJjMiiWJABJE+xyMGOgsrfhbkHs= go.opentelemetry.io/collector/config/configopaque v1.35.1-0.20250707130321-ac9adbf016bf/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.20250707130321-ac9adbf016bf h1:MND2M+o4RL1uS09uTkTsM0KpVOUZmxlMoh9v6XuqsdE= +go.opentelemetry.io/collector/config/configoptional v0.129.1-0.20250707130321-ac9adbf016bf/go.mod h1:QAUKdkMwnbI/o6TyY10UZC+KQvkr8enrect4H9RE8qk= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf h1:J8jnd8qbfcB7rAb6L0DfGWrqP2VQWvDz/8a0fN5z9+o= go.opentelemetry.io/collector/config/configretry v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf h1:8zUKv0BL5j7n3D2vasp+UMXc8CEAn1wOXmD2oW4oAvY= go.opentelemetry.io/collector/config/configtls v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:twLYBQkeB4r1EpGoDGiyOj6CVpxyTX9qCji/hRs75EE= -go.opentelemetry.io/collector/confmap v1.35.0 h1:U4JDATAl4PrKWe9bGHbZkoQXmJXefWgR2DIkFvw8ULQ= -go.opentelemetry.io/collector/confmap v1.35.0/go.mod h1:qX37ExVBa+WU4jWWJCZc7IJ+uBjb58/9oL+/ctF1Bt0= +go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf h1:x3Tuo3uZ7U9RoQX/wLHmpymnTjMymPTGTA669QUGms8= +go.opentelemetry.io/collector/confmap v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:taTeLqkfP3tzhZFv4Et036kqiWaKAteJ88f15RiEmOU= go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf h1:2IpK/q1PSzmYRycAPGqV29Lw1Z96E9c4koLEIQoIR0U= go.opentelemetry.io/collector/consumer v1.35.1-0.20250707130321-ac9adbf016bf/go.mod h1:9sSPX0hDHaHqzR2uSmfLOuFK9v3e9K3HRQ+fydAjOWs= go.opentelemetry.io/collector/consumer/consumererror v0.129.1-0.20250707130321-ac9adbf016bf h1:iKu7PpTdsRPsfFXeVGTsdcfZO1ORyf3ujcP3BRxN9u8= @@ -265,5 +264,3 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= -sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=