From 398ceedc6d0e7af98180e5e417e20aa173997874 Mon Sep 17 00:00:00 2001 From: Chao Date: Tue, 11 Feb 2025 00:55:35 +0800 Subject: [PATCH] Deprecate component.ValidateConfig --- connector/datadogconnector/go.mod | 2 +- connector/datadogconnector/go.sum | 4 +-- connector/exceptionsconnector/config_test.go | 3 +- connector/exceptionsconnector/go.mod | 1 + connector/exceptionsconnector/go.sum | 2 ++ connector/failoverconnector/config_test.go | 5 +-- connector/failoverconnector/go.mod | 1 + connector/failoverconnector/go.sum | 2 ++ .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- connector/routingconnector/config_test.go | 7 +++-- connector/routingconnector/go.mod | 1 + connector/routingconnector/go.sum | 2 ++ .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- .../config/config_test.go | 3 +- .../connector_test.go | 3 +- connector/signaltometricsconnector/go.mod | 1 + connector/signaltometricsconnector/go.sum | 2 ++ connector/spanmetricsconnector/config_test.go | 5 +-- connector/spanmetricsconnector/go.mod | 1 + connector/spanmetricsconnector/go.sum | 2 ++ exporter/alertmanagerexporter/config_test.go | 3 +- exporter/alertmanagerexporter/go.mod | 1 + exporter/alertmanagerexporter/go.sum | 2 ++ .../config_test.go | 3 +- .../alibabacloudlogserviceexporter/go.mod | 1 + .../alibabacloudlogserviceexporter/go.sum | 2 ++ .../awscloudwatchlogsexporter/config_test.go | 13 ++++---- exporter/awscloudwatchlogsexporter/go.mod | 1 + exporter/awscloudwatchlogsexporter/go.sum | 2 ++ exporter/awsemfexporter/config_test.go | 13 ++++---- exporter/awsemfexporter/go.mod | 1 + exporter/awsemfexporter/go.sum | 2 ++ exporter/awskinesisexporter/config_test.go | 3 +- exporter/awskinesisexporter/go.mod | 1 + exporter/awskinesisexporter/go.sum | 2 ++ exporter/awsxrayexporter/config_test.go | 3 +- exporter/awsxrayexporter/go.mod | 1 + exporter/awsxrayexporter/go.sum | 2 ++ .../azuredataexplorerexporter/config_test.go | 5 +-- exporter/azuredataexplorerexporter/go.mod | 1 + exporter/azuredataexplorerexporter/go.sum | 2 ++ exporter/azuremonitorexporter/config_test.go | 3 +- exporter/azuremonitorexporter/go.mod | 1 + exporter/azuremonitorexporter/go.sum | 2 ++ exporter/bmchelixexporter/config_test.go | 3 +- exporter/bmchelixexporter/go.mod | 1 + exporter/bmchelixexporter/go.sum | 2 ++ exporter/carbonexporter/config_test.go | 3 +- exporter/carbonexporter/go.mod | 1 + exporter/carbonexporter/go.sum | 2 ++ exporter/cassandraexporter/config_test.go | 3 +- exporter/cassandraexporter/go.mod | 1 + exporter/cassandraexporter/go.sum | 2 ++ exporter/clickhouseexporter/config_test.go | 9 +++--- exporter/clickhouseexporter/go.mod | 1 + exporter/clickhouseexporter/go.sum | 2 ++ exporter/coralogixexporter/config_test.go | 7 +++-- exporter/coralogixexporter/go.mod | 1 + exporter/coralogixexporter/go.sum | 2 ++ exporter/datadogexporter/go.mod | 2 +- exporter/datadogexporter/go.sum | 4 +-- .../datadogexporter/integrationtest/go.mod | 2 +- .../datadogexporter/integrationtest/go.sum | 4 +-- exporter/datasetexporter/factory_test.go | 5 +-- exporter/datasetexporter/go.mod | 1 + exporter/datasetexporter/go.sum | 2 ++ exporter/dorisexporter/config_test.go | 3 +- exporter/dorisexporter/go.mod | 1 + exporter/dorisexporter/go.sum | 2 ++ exporter/elasticsearchexporter/config_test.go | 9 +++--- exporter/elasticsearchexporter/go.mod | 1 + exporter/elasticsearchexporter/go.sum | 2 ++ .../integrationtest/go.mod | 2 +- .../integrationtest/go.sum | 4 +-- exporter/fileexporter/config_test.go | 5 +-- exporter/fileexporter/go.mod | 1 + exporter/fileexporter/go.sum | 2 ++ .../googlecloudpubsubexporter/exporter.go | 1 + .../exporter_test.go | 1 + .../publisher_client.go | 1 + .../publisher_client_test.go | 1 + .../honeycombmarkerexporter/config_test.go | 5 +-- exporter/honeycombmarkerexporter/go.mod | 1 + exporter/honeycombmarkerexporter/go.sum | 2 ++ exporter/influxdbexporter/config_test.go | 3 +- exporter/influxdbexporter/go.mod | 1 + exporter/influxdbexporter/go.sum | 2 ++ exporter/kafkaexporter/config_test.go | 3 +- exporter/kafkaexporter/go.mod | 1 + exporter/kafkaexporter/go.sum | 2 ++ exporter/kineticaexporter/config_test.go | 3 +- exporter/kineticaexporter/go.mod | 1 + exporter/kineticaexporter/go.sum | 2 ++ .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- .../loadbalancingexporter/resolver_k8s.go | 3 +- exporter/logicmonitorexporter/config_test.go | 3 +- exporter/logicmonitorexporter/go.mod | 1 + exporter/logicmonitorexporter/go.sum | 2 ++ exporter/lokiexporter/config_test.go | 3 +- exporter/lokiexporter/go.mod | 1 + exporter/lokiexporter/go.sum | 2 ++ .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- exporter/mezmoexporter/config_test.go | 3 +- exporter/mezmoexporter/go.mod | 1 + exporter/mezmoexporter/go.sum | 2 ++ exporter/opencensusexporter/config_test.go | 3 +- exporter/opencensusexporter/go.mod | 1 + exporter/opencensusexporter/go.sum | 2 ++ exporter/opensearchexporter/config_test.go | 3 +- exporter/opensearchexporter/go.mod | 1 + exporter/opensearchexporter/go.sum | 2 ++ exporter/otelarrowexporter/config_test.go | 3 +- exporter/otelarrowexporter/go.mod | 1 + exporter/otelarrowexporter/go.sum | 2 ++ exporter/prometheusexporter/config_test.go | 3 +- exporter/prometheusexporter/go.mod | 1 + exporter/prometheusexporter/go.sum | 4 +-- .../config_test.go | 5 +-- exporter/prometheusremotewriteexporter/go.mod | 1 + exporter/prometheusremotewriteexporter/go.sum | 2 ++ .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- exporter/pulsarexporter/config_test.go | 3 +- exporter/pulsarexporter/go.mod | 1 + exporter/pulsarexporter/go.sum | 2 ++ exporter/rabbitmqexporter/config_test.go | 5 +-- exporter/rabbitmqexporter/go.mod | 1 + exporter/rabbitmqexporter/go.sum | 2 ++ exporter/sapmexporter/config_test.go | 5 +-- exporter/sapmexporter/go.mod | 1 + exporter/sapmexporter/go.sum | 2 ++ exporter/sentryexporter/config_test.go | 3 +- exporter/sentryexporter/go.mod | 1 + exporter/sentryexporter/go.sum | 2 ++ exporter/signalfxexporter/config_test.go | 5 +-- exporter/signalfxexporter/go.mod | 1 + exporter/signalfxexporter/go.sum | 2 ++ exporter/splunkhecexporter/config_test.go | 5 +-- exporter/splunkhecexporter/go.mod | 1 + exporter/splunkhecexporter/go.sum | 2 ++ .../metadata/generated_telemetry_test.go | 3 +- exporter/sumologicexporter/config_test.go | 4 +-- exporter/sumologicexporter/factory_test.go | 3 +- exporter/sumologicexporter/go.mod | 1 + exporter/sumologicexporter/go.sum | 2 ++ .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- .../config_test.go | 3 +- .../tencentcloudlogserviceexporter/go.mod | 1 + .../tencentcloudlogserviceexporter/go.sum | 2 ++ exporter/zipkinexporter/config_test.go | 3 +- exporter/zipkinexporter/go.mod | 1 + exporter/zipkinexporter/go.sum | 2 ++ extension/asapauthextension/config_test.go | 5 +-- extension/asapauthextension/extension.go | 1 + extension/asapauthextension/extension_test.go | 1 + extension/asapauthextension/go.mod | 1 + extension/asapauthextension/go.sum | 2 ++ extension/awsproxy/config_test.go | 3 +- extension/awsproxy/go.mod | 1 + extension/awsproxy/go.sum | 2 ++ extension/basicauthextension/config_test.go | 5 +-- extension/basicauthextension/go.mod | 1 + extension/basicauthextension/go.sum | 2 ++ .../bearertokenauthextension/config_test.go | 5 +-- extension/bearertokenauthextension/go.mod | 1 + extension/bearertokenauthextension/go.sum | 2 ++ .../cgroupruntimeextension/config_test.go | 5 +-- extension/cgroupruntimeextension/go.mod | 1 + extension/cgroupruntimeextension/go.sum | 2 ++ .../headerssetterextension/config_test.go | 5 +-- extension/headerssetterextension/go.mod | 1 + extension/headerssetterextension/go.sum | 2 ++ extension/healthcheckextension/config_test.go | 5 +-- extension/healthcheckextension/go.mod | 1 + extension/healthcheckextension/go.sum | 2 ++ .../healthcheckv2extension/config_test.go | 5 +-- extension/healthcheckv2extension/go.mod | 1 + extension/healthcheckv2extension/go.sum | 2 ++ .../httpforwarderextension/config_test.go | 3 +- extension/httpforwarderextension/go.mod | 1 + extension/httpforwarderextension/go.sum | 2 ++ extension/jaegerremotesampling/config_test.go | 3 +- extension/jaegerremotesampling/go.mod | 1 + extension/jaegerremotesampling/go.sum | 2 ++ .../oauth2clientauthextension/config_test.go | 5 +-- extension/oauth2clientauthextension/go.mod | 1 + extension/oauth2clientauthextension/go.sum | 2 ++ .../observer/cfgardenobserver/config_test.go | 3 +- .../observer/cfgardenobserver/extension.go | 1 + .../cfgardenobserver/extension_test.go | 1 + extension/observer/cfgardenobserver/go.mod | 1 + extension/observer/cfgardenobserver/go.sum | 2 ++ .../observer/dockerobserver/config_test.go | 15 ++++----- extension/observer/dockerobserver/go.mod | 1 + extension/observer/dockerobserver/go.sum | 2 ++ extension/observer/ecsobserver/config_test.go | 5 +-- extension/observer/ecsobserver/go.mod | 1 + extension/observer/ecsobserver/go.sum | 2 ++ .../observer/ecstaskobserver/config_test.go | 5 +-- extension/observer/ecstaskobserver/go.mod | 1 + extension/observer/ecstaskobserver/go.sum | 2 ++ .../observer/hostobserver/config_test.go | 3 +- extension/observer/hostobserver/go.mod | 1 + extension/observer/hostobserver/go.sum | 2 ++ extension/observer/k8sobserver/config_test.go | 5 +-- extension/observer/k8sobserver/go.mod | 1 + extension/observer/k8sobserver/go.sum | 2 ++ extension/pprofextension/config_test.go | 3 +- extension/pprofextension/go.mod | 1 + extension/pprofextension/go.sum | 2 ++ extension/pprofextension/pprofextension.go | 3 +- extension/sigv4authextension/config_test.go | 5 +-- extension/sigv4authextension/go.mod | 1 + extension/sigv4authextension/go.sum | 2 ++ .../config_test.go | 3 +- .../solarwindsapmsettingsextension/go.mod | 1 + .../solarwindsapmsettingsextension/go.sum | 2 ++ extension/storage/filestorage/config_test.go | 9 +++--- extension/storage/filestorage/go.mod | 1 + extension/storage/filestorage/go.sum | 2 ++ .../redisstorageextension/config_test.go | 3 +- .../storage/redisstorageextension/go.mod | 1 + .../storage/redisstorageextension/go.sum | 2 ++ extension/sumologicextension/factory_test.go | 4 +-- extension/sumologicextension/go.mod | 8 +++++ extension/sumologicextension/go.sum | 16 ++++++++++ internal/kubelet/client.go | 5 +-- internal/kubelet/client_test.go | 3 +- internal/otelarrow/go.sum | 2 ++ .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- pkg/datadog/config/config_test.go | 3 +- pkg/datadog/go.mod | 1 + pkg/datadog/go.sum | 2 ++ pkg/golden/README.md | 2 +- .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- processor/attributesprocessor/config_test.go | 3 +- processor/attributesprocessor/factory_test.go | 4 +-- processor/attributesprocessor/go.mod | 1 + processor/attributesprocessor/go.sum | 2 ++ .../cumulativetodeltaprocessor/config_test.go | 5 +-- processor/cumulativetodeltaprocessor/go.mod | 1 + processor/cumulativetodeltaprocessor/go.sum | 2 ++ .../deltatocumulativeprocessor/config_test.go | 3 +- processor/deltatocumulativeprocessor/go.mod | 1 + processor/deltatocumulativeprocessor/go.sum | 2 ++ .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- processor/deltatorateprocessor/config_test.go | 5 +-- processor/deltatorateprocessor/go.mod | 1 + processor/deltatorateprocessor/go.sum | 2 ++ processor/filterprocessor/config_test.go | 27 ++++++++-------- processor/filterprocessor/go.mod | 1 + processor/filterprocessor/go.sum | 2 ++ .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- processor/geoipprocessor/config_test.go | 5 +-- processor/geoipprocessor/go.mod | 2 +- .../groupbyattrsprocessor/config_test.go | 3 +- processor/groupbyattrsprocessor/go.mod | 1 + processor/groupbyattrsprocessor/go.sum | 2 ++ .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- .../k8sattributesprocessor/config_test.go | 5 +-- processor/k8sattributesprocessor/go.mod | 1 + .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- .../metricsgenerationprocessor/config_test.go | 5 +-- processor/metricsgenerationprocessor/go.mod | 1 + processor/metricsgenerationprocessor/go.sum | 2 ++ .../metricstransformprocessor/config_test.go | 3 +- processor/metricstransformprocessor/go.mod | 1 + processor/metricstransformprocessor/go.sum | 2 ++ .../config_test.go | 3 +- .../probabilisticsamplerprocessor/go.mod | 2 +- .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- processor/redactionprocessor/config_test.go | 3 +- processor/redactionprocessor/go.mod | 1 + processor/redactionprocessor/go.sum | 2 ++ .../resourcedetectionprocessor/config_test.go | 5 +-- processor/resourcedetectionprocessor/go.mod | 1 + processor/resourcedetectionprocessor/go.sum | 2 ++ .../internal/gcp/gcp.go | 1 + processor/resourceprocessor/config_test.go | 5 +-- processor/resourceprocessor/go.mod | 1 + processor/resourceprocessor/go.sum | 2 ++ processor/routingprocessor/config_test.go | 5 +-- processor/routingprocessor/factory_test.go | 9 +++--- processor/routingprocessor/go.mod | 1 + .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- processor/schemaprocessor/config_test.go | 3 +- processor/schemaprocessor/go.mod | 1 + processor/schemaprocessor/go.sum | 2 ++ processor/spanprocessor/config_test.go | 3 +- processor/spanprocessor/go.mod | 1 + processor/spanprocessor/go.sum | 2 ++ .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- processor/transformprocessor/config_test.go | 5 +-- processor/transformprocessor/factory_test.go | 4 +-- processor/transformprocessor/go.mod | 1 + processor/transformprocessor/go.sum | 2 ++ .../activedirectorydsreceiver/config_test.go | 3 +- receiver/activedirectorydsreceiver/go.mod | 1 + receiver/activedirectorydsreceiver/go.sum | 2 ++ receiver/apachereceiver/config_test.go | 3 +- receiver/apachereceiver/factory_test.go | 4 +-- receiver/apachereceiver/go.mod | 1 + receiver/apachereceiver/go.sum | 2 ++ receiver/apachereceiver/scraper_test.go | 4 +-- receiver/awscloudwatchreceiver/config_test.go | 3 +- receiver/awscloudwatchreceiver/go.mod | 1 + receiver/awscloudwatchreceiver/go.sum | 2 ++ .../config_test.go | 3 +- receiver/awscontainerinsightreceiver/go.mod | 1 + receiver/awscontainerinsightreceiver/go.sum | 2 ++ .../config_test.go | 3 +- .../awsecscontainermetricsreceiver/go.mod | 1 + .../awsecscontainermetricsreceiver/go.sum | 2 ++ receiver/awsfirehosereceiver/config_test.go | 3 +- receiver/awsfirehosereceiver/go.mod | 1 + receiver/awsfirehosereceiver/go.sum | 2 ++ receiver/awss3receiver/config_test.go | 5 +-- receiver/awss3receiver/go.mod | 1 + receiver/awss3receiver/go.sum | 2 ++ receiver/awsxrayreceiver/config_test.go | 3 +- receiver/awsxrayreceiver/go.mod | 1 + receiver/awsxrayreceiver/go.sum | 2 ++ receiver/azureblobreceiver/config_test.go | 5 +-- receiver/azureblobreceiver/go.mod | 2 +- receiver/azureeventhubreceiver/config_test.go | 7 +++-- receiver/azureeventhubreceiver/go.mod | 2 +- receiver/carbonreceiver/config_test.go | 3 +- receiver/carbonreceiver/go.mod | 1 + receiver/carbonreceiver/go.sum | 2 ++ receiver/cloudflarereceiver/config_test.go | 3 +- receiver/cloudflarereceiver/go.mod | 1 + receiver/cloudflarereceiver/go.sum | 2 ++ receiver/cloudfoundryreceiver/config_test.go | 5 +-- receiver/cloudfoundryreceiver/converter.go | 1 + receiver/cloudfoundryreceiver/go.mod | 1 + receiver/cloudfoundryreceiver/go.sum | 2 ++ receiver/cloudfoundryreceiver/receiver.go | 1 + .../cloudfoundryreceiver/receiver_test.go | 1 + receiver/cloudfoundryreceiver/stream.go | 1 + receiver/collectdreceiver/config_test.go | 5 +-- receiver/collectdreceiver/go.mod | 1 + receiver/collectdreceiver/go.sum | 2 ++ receiver/couchdbreceiver/factory_test.go | 4 +-- receiver/couchdbreceiver/go.mod | 1 + receiver/couchdbreceiver/go.sum | 2 ++ receiver/couchdbreceiver/scraper_test.go | 8 ++--- receiver/dockerstatsreceiver/config_test.go | 9 +++--- receiver/dockerstatsreceiver/go.mod | 1 + receiver/dockerstatsreceiver/go.sum | 2 ++ receiver/elasticsearchreceiver/config_test.go | 13 ++++---- receiver/elasticsearchreceiver/go.mod | 1 + receiver/elasticsearchreceiver/go.sum | 2 ++ receiver/envoyalsreceiver/config_test.go | 3 +- receiver/envoyalsreceiver/go.mod | 1 + receiver/envoyalsreceiver/go.sum | 2 ++ receiver/expvarreceiver/config_test.go | 5 +-- receiver/expvarreceiver/go.mod | 1 + receiver/expvarreceiver/go.sum | 2 ++ receiver/filelogreceiver/filelog_test.go | 3 +- receiver/filelogreceiver/go.mod | 1 + receiver/filelogreceiver/go.sum | 2 ++ receiver/fluentforwardreceiver/config_test.go | 3 +- receiver/fluentforwardreceiver/go.mod | 1 + receiver/fluentforwardreceiver/go.sum | 2 ++ .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- .../googlecloudmonitoringreceiver/receiver.go | 1 + .../googlecloudpubsubreceiver/config_test.go | 3 +- receiver/googlecloudpubsubreceiver/go.mod | 1 + receiver/googlecloudpubsubreceiver/go.sum | 2 ++ .../internal/handler.go | 1 + .../internal/handler_test.go | 1 + .../internal/log_entry.go | 1 + .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- .../internal/subscriber_client.go | 1 + .../googlecloudpubsubreceiver/receiver.go | 1 + .../receiver_test.go | 1 + .../wrapped_subscriber_client.go | 1 + .../wrapped_subscriber_client_test.go | 1 + .../googlecloudspannerreceiver/config_test.go | 3 +- receiver/googlecloudspannerreceiver/go.mod | 1 + receiver/googlecloudspannerreceiver/go.sum | 2 ++ .../internal/datasource/database.go | 1 + .../internal/datasource/database_test.go | 1 + .../internal/metadata/metricvalue.go | 1 + .../statsreader/currentstatsreader.go | 1 + .../statsreader/currentstatsreader_test.go | 1 + .../statsreader/databasereader_test.go | 1 + .../statsreader/intervalstatsreader_test.go | 1 + .../statsreaders_mockedspanner_test.go | 1 + receiver/hostmetricsreceiver/config_test.go | 5 +-- receiver/hostmetricsreceiver/go.mod | 1 + receiver/hostmetricsreceiver/go.sum | 2 ++ .../hostmetrics_linux_test.go | 3 +- receiver/jaegerreceiver/config_test.go | 5 +-- receiver/jaegerreceiver/go.mod | 1 + receiver/jaegerreceiver/go.sum | 2 ++ receiver/jmxreceiver/config_test.go | 3 +- receiver/jmxreceiver/go.mod | 1 + receiver/k8sclusterreceiver/config_test.go | 7 +++-- receiver/k8sclusterreceiver/go.mod | 1 + receiver/k8seventsreceiver/config_test.go | 3 +- receiver/k8seventsreceiver/go.mod | 1 + receiver/k8seventsreceiver/go.sum | 2 ++ receiver/k8sobjectsreceiver/config_test.go | 5 +-- receiver/k8sobjectsreceiver/go.mod | 1 + receiver/kafkareceiver/config_test.go | 3 +- receiver/kafkareceiver/go.mod | 1 + receiver/kafkareceiver/go.sum | 2 ++ .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- receiver/kubeletstatsreceiver/config_test.go | 3 +- receiver/kubeletstatsreceiver/go.mod | 1 + receiver/lokireceiver/config_test.go | 5 +-- receiver/lokireceiver/go.mod | 1 + receiver/lokireceiver/go.sum | 2 ++ receiver/mongodbreceiver/config_test.go | 5 +-- receiver/mongodbreceiver/factory_test.go | 4 +-- receiver/mongodbreceiver/go.mod | 1 + receiver/mongodbreceiver/go.sum | 2 ++ receiver/mysqlreceiver/factory_test.go | 4 +-- receiver/mysqlreceiver/go.mod | 1 + receiver/mysqlreceiver/go.sum | 2 ++ receiver/namedpipereceiver/go.mod | 1 + receiver/namedpipereceiver/go.sum | 2 ++ receiver/namedpipereceiver/namedpipe_test.go | 3 +- receiver/netflowreceiver/config_test.go | 5 +-- receiver/netflowreceiver/go.mod | 1 + receiver/netflowreceiver/go.sum | 2 ++ receiver/nginxreceiver/go.mod | 1 + receiver/nginxreceiver/go.sum | 2 ++ receiver/nginxreceiver/scraper_test.go | 4 +-- receiver/nsxtreceiver/factory_test.go | 4 +-- receiver/nsxtreceiver/go.mod | 1 + receiver/nsxtreceiver/go.sum | 2 ++ receiver/opencensusreceiver/config_test.go | 3 +- receiver/opencensusreceiver/go.mod | 1 + receiver/opencensusreceiver/go.sum | 2 ++ receiver/otelarrowreceiver/config_test.go | 4 +-- receiver/otelarrowreceiver/go.mod | 1 + receiver/otelarrowreceiver/go.sum | 2 ++ receiver/podmanreceiver/config_test.go | 5 +-- receiver/podmanreceiver/go.mod | 1 + receiver/podmanreceiver/go.sum | 2 ++ receiver/postgresqlreceiver/config_test.go | 3 +- receiver/postgresqlreceiver/factory_test.go | 4 +-- receiver/postgresqlreceiver/go.mod | 1 + receiver/postgresqlreceiver/go.sum | 2 ++ receiver/prometheusreceiver/config_test.go | 31 ++++++++++--------- receiver/prometheusreceiver/go.mod | 2 +- receiver/prometheusreceiver/go.sum | 4 +-- .../targetallocator/config_test.go | 24 +++++++------- receiver/purefareceiver/config_test.go | 3 +- receiver/purefareceiver/go.mod | 1 + receiver/purefareceiver/go.sum | 4 +-- receiver/purefbreceiver/config_test.go | 3 +- receiver/purefbreceiver/go.mod | 1 + receiver/purefbreceiver/go.sum | 4 +-- receiver/receivercreator/config_test.go | 3 +- receiver/receivercreator/go.mod | 2 +- receiver/receivercreator/runner.go | 3 +- receiver/saphanareceiver/config_test.go | 3 +- receiver/saphanareceiver/factory_test.go | 4 +-- receiver/saphanareceiver/go.mod | 1 + receiver/saphanareceiver/go.sum | 2 ++ receiver/sapmreceiver/config_test.go | 3 +- receiver/sapmreceiver/go.mod | 1 + receiver/sapmreceiver/go.sum | 2 ++ receiver/signalfxreceiver/config_test.go | 3 +- receiver/signalfxreceiver/go.mod | 1 + receiver/signalfxreceiver/go.sum | 2 ++ .../simpleprometheusreceiver/config_test.go | 3 +- receiver/simpleprometheusreceiver/go.mod | 1 + receiver/simpleprometheusreceiver/go.sum | 4 +-- receiver/skywalkingreceiver/config_test.go | 3 +- receiver/skywalkingreceiver/go.mod | 1 + receiver/skywalkingreceiver/go.sum | 2 ++ .../internal/trace/tracing_report_service.go | 5 +-- .../skywalkingreceiver/skywalking_receiver.go | 7 +++-- .../skywalking_receiver_test.go | 1 + receiver/snmpreceiver/config_helper_test.go | 1 - receiver/snmpreceiver/config_test.go | 9 +++--- receiver/snmpreceiver/factory.go | 3 +- receiver/snmpreceiver/go.mod | 2 +- receiver/snowflakereceiver/config_test.go | 3 +- receiver/snowflakereceiver/factory_test.go | 6 ++-- receiver/snowflakereceiver/go.mod | 1 + receiver/snowflakereceiver/go.sum | 2 ++ receiver/snowflakereceiver/scraper_test.go | 6 ++-- receiver/solacereceiver/config_test.go | 13 ++++---- receiver/solacereceiver/go.mod | 1 + receiver/solacereceiver/go.sum | 2 ++ .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- receiver/splunkhecreceiver/config_test.go | 3 +- receiver/splunkhecreceiver/go.mod | 1 + receiver/splunkhecreceiver/go.sum | 2 ++ receiver/sqlqueryreceiver/config_test.go | 7 +++-- receiver/sqlqueryreceiver/go.mod | 1 + receiver/sqlqueryreceiver/go.sum | 2 ++ .../sqlserverreceiver/config_others_test.go | 6 ++-- receiver/sqlserverreceiver/config_test.go | 10 +++--- .../sqlserverreceiver/config_windows_test.go | 6 ++-- receiver/sqlserverreceiver/go.mod | 1 + receiver/sqlserverreceiver/go.sum | 2 ++ receiver/statsdreceiver/config_test.go | 3 +- receiver/statsdreceiver/go.mod | 1 + receiver/statsdreceiver/go.sum | 2 ++ .../internal/metadata/generated_telemetry.go | 3 +- .../metadata/generated_telemetry_test.go | 5 ++- .../generated_telemetrytest_test.go | 3 +- receiver/syslogreceiver/go.mod | 1 + receiver/syslogreceiver/go.sum | 2 ++ receiver/syslogreceiver/syslog_test.go | 4 +-- receiver/tcplogreceiver/go.mod | 1 + receiver/tcplogreceiver/go.sum | 2 ++ receiver/tcplogreceiver/tcp_test.go | 4 +-- receiver/udplogreceiver/go.mod | 1 + receiver/udplogreceiver/go.sum | 2 ++ receiver/udplogreceiver/udp_test.go | 4 +-- receiver/wavefrontreceiver/config_test.go | 3 +- receiver/wavefrontreceiver/go.mod | 1 + receiver/wavefrontreceiver/go.sum | 2 ++ receiver/webhookeventreceiver/config_test.go | 3 +- receiver/webhookeventreceiver/go.mod | 1 + receiver/webhookeventreceiver/go.sum | 2 ++ .../config_test.go | 5 +-- .../factory_test.go | 4 +-- receiver/windowsperfcountersreceiver/go.mod | 1 + receiver/windowsperfcountersreceiver/go.sum | 2 ++ receiver/zipkinreceiver/config_test.go | 3 +- receiver/zipkinreceiver/go.mod | 1 + receiver/zipkinreceiver/go.sum | 2 ++ testbed/go.mod | 2 +- testbed/go.sum | 4 +-- 572 files changed, 1081 insertions(+), 532 deletions(-) diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index 67e9d94cb471..ff62254156d4 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -261,7 +261,7 @@ require ( go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 // indirect + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 // indirect go.opentelemetry.io/collector/connector/xconnector v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.119.1-0.20250210123122-44b3eeda354c // indirect diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum index 40a563f553bd..2719f450cfc6 100644 --- a/connector/datadogconnector/go.sum +++ b/connector/datadogconnector/go.sum @@ -932,8 +932,8 @@ go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.2025021012 go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:tAn9Ahbs+y/lBv0etEnVg401hhiHGIXneALyD2I3qIs= go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c h1:0ppSb3ys8iZ5m/5otvsoN8cWtbHn12+iY7K5iLlAudQ= go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:3+woatuB5xT10fnmHu5DPujf/rBVi2sntNu2cjqFtYs= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 h1:BgAdd947V9z5fnOb3mQf/5UhFFA3dhYKdG78t4mWIuo= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c h1:mwG3+ASFnw01qNc1SM23L2OnFIoR3XaALy67ymuF3/o= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:rAzQkXy+CIR8N1bfc5Y1nQ2fhN1XyXWAKOKQ76c1Xuw= go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c h1:F0bQSB7lVDbcUy48XgCcDaVvNQvFa01AFGkGENm1mPo= diff --git a/connector/exceptionsconnector/config_test.go b/connector/exceptionsconnector/config_test.go index cfe8099a692a..dc23f4ed0441 100644 --- a/connector/exceptionsconnector/config_test.go +++ b/connector/exceptionsconnector/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector/internal/metadata" ) @@ -52,7 +53,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) err = sub.Unmarshal(cfg) assert.NoError(t, err) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/connector/exceptionsconnector/go.mod b/connector/exceptionsconnector/go.mod index 5d9fa22744b2..7825a3fb9c62 100644 --- a/connector/exceptionsconnector/go.mod +++ b/connector/exceptionsconnector/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c diff --git a/connector/exceptionsconnector/go.sum b/connector/exceptionsconnector/go.sum index 6fee0666b28d..fd776d0568c8 100644 --- a/connector/exceptionsconnector/go.sum +++ b/connector/exceptionsconnector/go.sum @@ -60,6 +60,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c h1:mwG3+ASFnw01qNc1SM23L2OnFIoR3XaALy67ymuF3/o= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:rAzQkXy+CIR8N1bfc5Y1nQ2fhN1XyXWAKOKQ76c1Xuw= go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c h1:F0bQSB7lVDbcUy48XgCcDaVvNQvFa01AFGkGENm1mPo= diff --git a/connector/failoverconnector/config_test.go b/connector/failoverconnector/config_test.go index 13c47851217b..39e9bfe8d995 100644 --- a/connector/failoverconnector/config_test.go +++ b/connector/failoverconnector/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/pipeline" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector/internal/metadata" @@ -72,7 +73,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tc.expected, cfg) }) } @@ -109,7 +110,7 @@ func TestValidateConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.ErrorContains(t, component.ValidateConfig(cfg), tc.err.Error()) + assert.ErrorContains(t, xconfmap.Validate(cfg), tc.err.Error()) }) }) } diff --git a/connector/failoverconnector/go.mod b/connector/failoverconnector/go.mod index c09be18efccb..0cc4b56f55af 100644 --- a/connector/failoverconnector/go.mod +++ b/connector/failoverconnector/go.mod @@ -7,6 +7,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c diff --git a/connector/failoverconnector/go.sum b/connector/failoverconnector/go.sum index acac6c8fe1b6..d09d15393a04 100644 --- a/connector/failoverconnector/go.sum +++ b/connector/failoverconnector/go.sum @@ -60,6 +60,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c h1:mwG3+ASFnw01qNc1SM23L2OnFIoR3XaALy67ymuF3/o= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:rAzQkXy+CIR8N1bfc5Y1nQ2fhN1XyXWAKOKQ76c1Xuw= go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c h1:F0bQSB7lVDbcUy48XgCcDaVvNQvFa01AFGkGENm1mPo= diff --git a/connector/grafanacloudconnector/internal/metadata/generated_telemetry.go b/connector/grafanacloudconnector/internal/metadata/generated_telemetry.go index 6569a485557d..898754446016 100644 --- a/connector/grafanacloudconnector/internal/metadata/generated_telemetry.go +++ b/connector/grafanacloudconnector/internal/metadata/generated_telemetry.go @@ -7,11 +7,10 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/embedded" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/connector/grafanacloudconnector/internal/metadata/generated_telemetry_test.go b/connector/grafanacloudconnector/internal/metadata/generated_telemetry_test.go index dacf9b2ea200..f94b236082cb 100644 --- a/connector/grafanacloudconnector/internal/metadata/generated_telemetry_test.go +++ b/connector/grafanacloudconnector/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/connector/grafanacloudconnector/internal/metadatatest/generated_telemetrytest_test.go b/connector/grafanacloudconnector/internal/metadatatest/generated_telemetrytest_test.go index de2b29a4ebe8..6bd47ad449e1 100644 --- a/connector/grafanacloudconnector/internal/metadatatest/generated_telemetrytest_test.go +++ b/connector/grafanacloudconnector/internal/metadatatest/generated_telemetrytest_test.go @@ -7,13 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/connector/routingconnector/config_test.go b/connector/routingconnector/config_test.go index 1538b0a3843a..0223fb3e3909 100644 --- a/connector/routingconnector/config_test.go +++ b/connector/routingconnector/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/pipeline" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector/internal/metadata" @@ -112,7 +113,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -379,9 +380,9 @@ func TestValidateConfig(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { if tt.error == "" { - assert.NoError(t, component.ValidateConfig(tt.config)) + assert.NoError(t, xconfmap.Validate(tt.config)) } else { - assert.EqualError(t, component.ValidateConfig(tt.config), tt.error) + assert.EqualError(t, xconfmap.Validate(tt.config), tt.error) } }) } diff --git a/connector/routingconnector/go.mod b/connector/routingconnector/go.mod index 043c781f0261..a98142f88737 100644 --- a/connector/routingconnector/go.mod +++ b/connector/routingconnector/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c diff --git a/connector/routingconnector/go.sum b/connector/routingconnector/go.sum index 54ea6ffb35df..204823b703f3 100644 --- a/connector/routingconnector/go.sum +++ b/connector/routingconnector/go.sum @@ -95,6 +95,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c h1:mwG3+ASFnw01qNc1SM23L2OnFIoR3XaALy67ymuF3/o= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:rAzQkXy+CIR8N1bfc5Y1nQ2fhN1XyXWAKOKQ76c1Xuw= go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c h1:F0bQSB7lVDbcUy48XgCcDaVvNQvFa01AFGkGENm1mPo= diff --git a/connector/servicegraphconnector/internal/metadata/generated_telemetry.go b/connector/servicegraphconnector/internal/metadata/generated_telemetry.go index 29c06509a415..cd426a2618e6 100644 --- a/connector/servicegraphconnector/internal/metadata/generated_telemetry.go +++ b/connector/servicegraphconnector/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/connector/servicegraphconnector/internal/metadata/generated_telemetry_test.go b/connector/servicegraphconnector/internal/metadata/generated_telemetry_test.go index ce3ddb673243..a015482f00da 100644 --- a/connector/servicegraphconnector/internal/metadata/generated_telemetry_test.go +++ b/connector/servicegraphconnector/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/connector/servicegraphconnector/internal/metadatatest/generated_telemetrytest_test.go b/connector/servicegraphconnector/internal/metadatatest/generated_telemetrytest_test.go index d389dacac01d..bd30eaa50bca 100644 --- a/connector/servicegraphconnector/internal/metadatatest/generated_telemetrytest_test.go +++ b/connector/servicegraphconnector/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/connector/signaltometricsconnector/config/config_test.go b/connector/signaltometricsconnector/config/config_test.go index 202fa4f70a3b..a7fb1aa21698 100644 --- a/connector/signaltometricsconnector/config/config_test.go +++ b/connector/signaltometricsconnector/config/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector/internal/metadata" ) @@ -179,7 +180,7 @@ func TestConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(&cfg)) - err = component.ValidateConfig(cfg) + err = xconfmap.Validate(cfg) if len(tc.errorMsgs) > 0 { for _, errMsg := range tc.errorMsgs { assert.ErrorContains(t, err, errMsg) diff --git a/connector/signaltometricsconnector/connector_test.go b/connector/signaltometricsconnector/connector_test.go index 0464492f131f..b036e6fcb3b4 100644 --- a/connector/signaltometricsconnector/connector_test.go +++ b/connector/signaltometricsconnector/connector_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/connector" "go.opentelemetry.io/collector/connector/connectortest" "go.opentelemetry.io/collector/consumer" @@ -297,7 +298,7 @@ func setupConnector( sub, err := cm.Sub(component.NewIDWithName(metadata.Type, "").String()) require.NoError(t, err) require.NoError(t, sub.Unmarshal(&cfg)) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) return factory, settings, cfg } diff --git a/connector/signaltometricsconnector/go.mod b/connector/signaltometricsconnector/go.mod index f0ecdbc938b3..19f927c1a205 100644 --- a/connector/signaltometricsconnector/go.mod +++ b/connector/signaltometricsconnector/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c diff --git a/connector/signaltometricsconnector/go.sum b/connector/signaltometricsconnector/go.sum index ded9e092bbaf..4e9542ca03aa 100644 --- a/connector/signaltometricsconnector/go.sum +++ b/connector/signaltometricsconnector/go.sum @@ -93,6 +93,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c h1:mwG3+ASFnw01qNc1SM23L2OnFIoR3XaALy67ymuF3/o= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:rAzQkXy+CIR8N1bfc5Y1nQ2fhN1XyXWAKOKQ76c1Xuw= go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c h1:F0bQSB7lVDbcUy48XgCcDaVvNQvFa01AFGkGENm1mPo= diff --git a/connector/spanmetricsconnector/config_test.go b/connector/spanmetricsconnector/config_test.go index 79c823f9b574..035efe52c9bd 100644 --- a/connector/spanmetricsconnector/config_test.go +++ b/connector/spanmetricsconnector/config_test.go @@ -14,6 +14,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/pdata/pmetric" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector/internal/metadata" @@ -176,11 +177,11 @@ func TestLoadConfig(t *testing.T) { err = sub.Unmarshal(cfg) if tt.expected == nil { - err = errors.Join(err, component.ValidateConfig(cfg)) + err = errors.Join(err, xconfmap.Validate(cfg)) assert.ErrorContains(t, err, tt.errorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) if tt.extraAssertions != nil { tt.extraAssertions(cfg.(*Config)) diff --git a/connector/spanmetricsconnector/go.mod b/connector/spanmetricsconnector/go.mod index 3af0cb9117ca..a19d04575800 100644 --- a/connector/spanmetricsconnector/go.mod +++ b/connector/spanmetricsconnector/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c diff --git a/connector/spanmetricsconnector/go.sum b/connector/spanmetricsconnector/go.sum index 0f51ba22132c..105128adc588 100644 --- a/connector/spanmetricsconnector/go.sum +++ b/connector/spanmetricsconnector/go.sum @@ -68,6 +68,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c h1:mwG3+ASFnw01qNc1SM23L2OnFIoR3XaALy67ymuF3/o= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:rAzQkXy+CIR8N1bfc5Y1nQ2fhN1XyXWAKOKQ76c1Xuw= go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c h1:F0bQSB7lVDbcUy48XgCcDaVvNQvFa01AFGkGENm1mPo= diff --git a/exporter/alertmanagerexporter/config_test.go b/exporter/alertmanagerexporter/config_test.go index 0766c02704b6..eb357be6ccb8 100644 --- a/exporter/alertmanagerexporter/config_test.go +++ b/exporter/alertmanagerexporter/config_test.go @@ -17,6 +17,7 @@ import ( "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter/internal/metadata" @@ -92,7 +93,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/alertmanagerexporter/go.mod b/exporter/alertmanagerexporter/go.mod index 59c79f637d55..a256843104bb 100644 --- a/exporter/alertmanagerexporter/go.mod +++ b/exporter/alertmanagerexporter/go.mod @@ -14,6 +14,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/alertmanagerexporter/go.sum b/exporter/alertmanagerexporter/go.sum index 1820eb392d2e..0ba29499ae35 100644 --- a/exporter/alertmanagerexporter/go.sum +++ b/exporter/alertmanagerexporter/go.sum @@ -92,6 +92,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/alibabacloudlogserviceexporter/config_test.go b/exporter/alibabacloudlogserviceexporter/config_test.go index 3af84173c7dd..ff349df6ba52 100644 --- a/exporter/alibabacloudlogserviceexporter/config_test.go +++ b/exporter/alibabacloudlogserviceexporter/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter/internal/metadata" ) @@ -54,7 +55,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index df67feb8def3..cd65cc1d06fc 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index c98caab463bc..543aa483da5f 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -113,6 +113,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/awscloudwatchlogsexporter/config_test.go b/exporter/awscloudwatchlogsexporter/config_test.go index 258ed8fadfcd..f52818f15879 100644 --- a/exporter/awscloudwatchlogsexporter/config_test.go +++ b/exporter/awscloudwatchlogsexporter/config_test.go @@ -15,6 +15,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.uber.org/multierr" @@ -99,11 +100,11 @@ func TestLoadConfig(t *testing.T) { err = sub.Unmarshal(cfg) if tt.expected == nil { - err = multierr.Append(err, component.ValidateConfig(cfg)) + err = multierr.Append(err, xconfmap.Validate(cfg)) assert.ErrorContains(t, err, tt.errorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -124,7 +125,7 @@ func TestRetentionValidateCorrect(t *testing.T) { QueueSize: exporterhelper.NewDefaultQueueConfig().QueueSize, }, } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) } func TestRetentionValidateWrong(t *testing.T) { @@ -141,7 +142,7 @@ func TestRetentionValidateWrong(t *testing.T) { QueueSize: exporterhelper.NewDefaultQueueConfig().QueueSize, }, } - assert.Error(t, component.ValidateConfig(wrongcfg)) + assert.Error(t, xconfmap.Validate(wrongcfg)) } func TestValidateTags(t *testing.T) { @@ -226,10 +227,10 @@ func TestValidateTags(t *testing.T) { }, } if tt.errorMessage != "" { - assert.ErrorContains(t, component.ValidateConfig(cfg), tt.errorMessage) + assert.ErrorContains(t, xconfmap.Validate(cfg), tt.errorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) }) } } diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index 5b8246ef4f86..a6f4bfb006db 100644 --- a/exporter/awscloudwatchlogsexporter/go.mod +++ b/exporter/awscloudwatchlogsexporter/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum index 40d5a5bc177b..e373cfbe388f 100644 --- a/exporter/awscloudwatchlogsexporter/go.sum +++ b/exporter/awscloudwatchlogsexporter/go.sum @@ -72,6 +72,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/awsemfexporter/config_test.go b/exporter/awsemfexporter/config_test.go index 0be4cabab71d..bdcfa5f39e20 100644 --- a/exporter/awsemfexporter/config_test.go +++ b/exporter/awsemfexporter/config_test.go @@ -13,6 +13,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/featuregate" "go.uber.org/zap" @@ -115,7 +116,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -138,7 +139,7 @@ func TestConfigValidate(t *testing.T) { MetricDescriptors: incorrectDescriptor, logger: zap.NewNop(), } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Len(t, cfg.MetricDescriptors, 2) assert.Equal(t, []MetricDescriptor{ @@ -158,7 +159,7 @@ func TestRetentionValidateCorrect(t *testing.T) { ResourceToTelemetrySettings: resourcetotelemetry.Settings{Enabled: true}, logger: zap.NewNop(), } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) } func TestRetentionValidateWrong(t *testing.T) { @@ -172,7 +173,7 @@ func TestRetentionValidateWrong(t *testing.T) { ResourceToTelemetrySettings: resourcetotelemetry.Settings{Enabled: true}, logger: zap.NewNop(), } - assert.Error(t, component.ValidateConfig(wrongcfg)) + assert.Error(t, xconfmap.Validate(wrongcfg)) } func TestValidateTags(t *testing.T) { @@ -252,10 +253,10 @@ func TestValidateTags(t *testing.T) { logger: zap.NewNop(), } if tt.errorMessage != "" { - assert.ErrorContains(t, component.ValidateConfig(cfg), tt.errorMessage) + assert.ErrorContains(t, xconfmap.Validate(cfg), tt.errorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) }) } } diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index a500b5b4cf4a..a3a7a97e50b1 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -14,6 +14,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index ba641585d345..b162e9a0c030 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -72,6 +72,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/awskinesisexporter/config_test.go b/exporter/awskinesisexporter/config_test.go index 344fa304046e..1063e05f4fbe 100644 --- a/exporter/awskinesisexporter/config_test.go +++ b/exporter/awskinesisexporter/config_test.go @@ -15,6 +15,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskinesisexporter/internal/batch" @@ -86,7 +87,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index 8a8de7093da6..c2e2226823e8 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -19,6 +19,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index f0cf8af00015..cfbb22fe4cc6 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -105,6 +105,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/awsxrayexporter/config_test.go b/exporter/awsxrayexporter/config_test.go index ce11f651eee5..0446b154d098 100644 --- a/exporter/awsxrayexporter/config_test.go +++ b/exporter/awsxrayexporter/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter/internal/metadata" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil" @@ -62,7 +63,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index 52f1b24f54dd..f7c0c60c7b9b 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index 7b214103b360..bd32a025aeb3 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -72,6 +72,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/azuredataexplorerexporter/config_test.go b/exporter/azuredataexplorerexporter/config_test.go index d124e01fc163..511d29c7d548 100644 --- a/exporter/azuredataexplorerexporter/config_test.go +++ b/exporter/azuredataexplorerexporter/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter/internal/metadata" @@ -135,10 +136,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.expected == nil { - assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) + assert.EqualError(t, xconfmap.Validate(cfg), tt.errorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/azuredataexplorerexporter/go.mod b/exporter/azuredataexplorerexporter/go.mod index 4bedfd237be8..a4ca14f9b322 100644 --- a/exporter/azuredataexplorerexporter/go.mod +++ b/exporter/azuredataexplorerexporter/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/exporter/azuredataexplorerexporter/go.sum b/exporter/azuredataexplorerexporter/go.sum index 4f154b0a4079..2a078ed30a05 100644 --- a/exporter/azuredataexplorerexporter/go.sum +++ b/exporter/azuredataexplorerexporter/go.sum @@ -136,6 +136,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/azuremonitorexporter/config_test.go b/exporter/azuremonitorexporter/config_test.go index 6172b23a1b7e..4bc15312a3f2 100644 --- a/exporter/azuremonitorexporter/config_test.go +++ b/exporter/azuremonitorexporter/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter/internal/metadata" @@ -61,7 +62,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index 6d7fce3620e2..bfc7105b7330 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index 6a306324759a..6a8ad1f5df94 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -85,6 +85,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/bmchelixexporter/config_test.go b/exporter/bmchelixexporter/config_test.go index c6246adf7a46..b08f6c95b375 100644 --- a/exporter/bmchelixexporter/config_test.go +++ b/exporter/bmchelixexporter/config_test.go @@ -14,6 +14,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/bmchelixexporter/internal/metadata" ) @@ -63,7 +64,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/bmchelixexporter/go.mod b/exporter/bmchelixexporter/go.mod index 56d90c7b8080..0c8cfe78e6bb 100644 --- a/exporter/bmchelixexporter/go.mod +++ b/exporter/bmchelixexporter/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/exporter/bmchelixexporter/go.sum b/exporter/bmchelixexporter/go.sum index d9c8dd85b21e..80add0e92593 100644 --- a/exporter/bmchelixexporter/go.sum +++ b/exporter/bmchelixexporter/go.sum @@ -88,6 +88,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/carbonexporter/config_test.go b/exporter/carbonexporter/config_test.go index 795f0622d702..4b1b8ed9bdf5 100644 --- a/exporter/carbonexporter/config_test.go +++ b/exporter/carbonexporter/config_test.go @@ -14,6 +14,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter/internal/metadata" @@ -74,7 +75,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index b39bc649f6a6..a6e8cd798ee3 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index c4bda9787776..36658dc4360c 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -66,6 +66,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/cassandraexporter/config_test.go b/exporter/cassandraexporter/config_test.go index a00d6d21e7af..63c8e409bb64 100644 --- a/exporter/cassandraexporter/config_test.go +++ b/exporter/cassandraexporter/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassandraexporter/internal/metadata" ) @@ -49,7 +50,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/cassandraexporter/go.mod b/exporter/cassandraexporter/go.mod index 7fa46a6a53b3..a3989e7f057e 100644 --- a/exporter/cassandraexporter/go.mod +++ b/exporter/cassandraexporter/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/exporter/cassandraexporter/go.sum b/exporter/cassandraexporter/go.sum index 749ba15ef965..fb2a5f01a47b 100644 --- a/exporter/cassandraexporter/go.sum +++ b/exporter/cassandraexporter/go.sum @@ -80,6 +80,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/clickhouseexporter/config_test.go b/exporter/clickhouseexporter/config_test.go index b3167ed52fc7..a4a1124727d1 100644 --- a/exporter/clickhouseexporter/config_test.go +++ b/exporter/clickhouseexporter/config_test.go @@ -17,6 +17,7 @@ import ( "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter/internal" @@ -94,7 +95,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -542,7 +543,7 @@ func TestShouldCreateSchema(t *testing.T) { for _, tt := range tests { t.Run(fmt.Sprintf("ShouldCreateSchema case %s", tt.name), func(t *testing.T) { - assert.NoError(t, component.ValidateConfig(tt)) + assert.NoError(t, xconfmap.Validate(tt)) assert.Equal(t, tt.expected, tt.input.shouldCreateSchema()) }) } @@ -584,7 +585,7 @@ func TestTableEngineConfigParsing(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg.(*Config).tableEngineString()) }) } @@ -617,7 +618,7 @@ func TestClusterString(t *testing.T) { cfg.(*Config).Endpoint = defaultEndpoint cfg.(*Config).ClusterName = tt.input - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg.(*Config).clusterString()) }) } diff --git a/exporter/clickhouseexporter/go.mod b/exporter/clickhouseexporter/go.mod index f03954f74369..0fd932aa5535 100644 --- a/exporter/clickhouseexporter/go.mod +++ b/exporter/clickhouseexporter/go.mod @@ -14,6 +14,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/exporter/clickhouseexporter/go.sum b/exporter/clickhouseexporter/go.sum index f84e104a0542..ccdb727fe01c 100644 --- a/exporter/clickhouseexporter/go.sum +++ b/exporter/clickhouseexporter/go.sum @@ -191,6 +191,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/coralogixexporter/config_test.go b/exporter/coralogixexporter/config_test.go index d83c42cb59ee..312d0cf56e9b 100644 --- a/exporter/coralogixexporter/config_test.go +++ b/exporter/coralogixexporter/config_test.go @@ -18,6 +18,7 @@ import ( "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" @@ -158,7 +159,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -191,7 +192,7 @@ func TestMetricsExporter(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(metadata.Type, "metrics").String()) require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) params := exportertest.NewNopSettings() @@ -211,7 +212,7 @@ func TestLogsExporter(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(metadata.Type, "logs").String()) require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) params := exportertest.NewNopSettings() diff --git a/exporter/coralogixexporter/go.mod b/exporter/coralogixexporter/go.mod index d4a77e3e2a15..6e2b43408e02 100644 --- a/exporter/coralogixexporter/go.mod +++ b/exporter/coralogixexporter/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/coralogixexporter/go.sum b/exporter/coralogixexporter/go.sum index d8cc612391d5..710d3d0bcae7 100644 --- a/exporter/coralogixexporter/go.sum +++ b/exporter/coralogixexporter/go.sum @@ -86,6 +86,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index b8dce9e64439..f2714be8beb6 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -356,7 +356,7 @@ require ( go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 // indirect + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 // indirect go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/xconnector v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 0d813ae27c22..6ead1738e534 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -1087,8 +1087,8 @@ go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.2025021012 go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:tAn9Ahbs+y/lBv0etEnVg401hhiHGIXneALyD2I3qIs= go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c h1:0ppSb3ys8iZ5m/5otvsoN8cWtbHn12+iY7K5iLlAudQ= go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:3+woatuB5xT10fnmHu5DPujf/rBVi2sntNu2cjqFtYs= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 h1:BgAdd947V9z5fnOb3mQf/5UhFFA3dhYKdG78t4mWIuo= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c h1:mwG3+ASFnw01qNc1SM23L2OnFIoR3XaALy67ymuF3/o= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:rAzQkXy+CIR8N1bfc5Y1nQ2fhN1XyXWAKOKQ76c1Xuw= go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c h1:F0bQSB7lVDbcUy48XgCcDaVvNQvFa01AFGkGENm1mPo= diff --git a/exporter/datadogexporter/integrationtest/go.mod b/exporter/datadogexporter/integrationtest/go.mod index 36d9431e7233..1ba1b9aa0ddf 100644 --- a/exporter/datadogexporter/integrationtest/go.mod +++ b/exporter/datadogexporter/integrationtest/go.mod @@ -325,7 +325,7 @@ require ( go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 // indirect + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 // indirect go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/xconnector v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c // indirect diff --git a/exporter/datadogexporter/integrationtest/go.sum b/exporter/datadogexporter/integrationtest/go.sum index c1ee809dfff1..e3b89cfe3214 100644 --- a/exporter/datadogexporter/integrationtest/go.sum +++ b/exporter/datadogexporter/integrationtest/go.sum @@ -1073,8 +1073,8 @@ go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.2025021012 go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:tAn9Ahbs+y/lBv0etEnVg401hhiHGIXneALyD2I3qIs= go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c h1:0ppSb3ys8iZ5m/5otvsoN8cWtbHn12+iY7K5iLlAudQ= go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:3+woatuB5xT10fnmHu5DPujf/rBVi2sntNu2cjqFtYs= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 h1:BgAdd947V9z5fnOb3mQf/5UhFFA3dhYKdG78t4mWIuo= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c h1:mwG3+ASFnw01qNc1SM23L2OnFIoR3XaALy67ymuF3/o= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:rAzQkXy+CIR8N1bfc5Y1nQ2fhN1XyXWAKOKQ76c1Xuw= go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c h1:F0bQSB7lVDbcUy48XgCcDaVvNQvFa01AFGkGENm1mPo= diff --git a/exporter/datasetexporter/factory_test.go b/exporter/datasetexporter/factory_test.go index c7e8dd95b0e1..45bb82657d16 100644 --- a/exporter/datasetexporter/factory_test.go +++ b/exporter/datasetexporter/factory_test.go @@ -15,6 +15,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datasetexporter/internal/metadata" @@ -148,7 +149,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - if assert.NoError(t, component.ValidateConfig(cfg)) { + if assert.NoError(t, xconfmap.Validate(cfg)) { assert.Equal(t, tt.expected, cfg) } }) @@ -160,7 +161,7 @@ func TestValidateConfigs(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(*testing.T) { - err := component.ValidateConfig(tt.config) + err := xconfmap.Validate(tt.config) if tt.expectedError != nil { assert.ErrorContains(t, err, tt.expectedError.Error()) } else { diff --git a/exporter/datasetexporter/go.mod b/exporter/datasetexporter/go.mod index 92d065f23221..0412bd2e6e8e 100644 --- a/exporter/datasetexporter/go.mod +++ b/exporter/datasetexporter/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c ) diff --git a/exporter/datasetexporter/go.sum b/exporter/datasetexporter/go.sum index e8339c523f3a..351ca58640cc 100644 --- a/exporter/datasetexporter/go.sum +++ b/exporter/datasetexporter/go.sum @@ -68,6 +68,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/dorisexporter/config_test.go b/exporter/dorisexporter/config_test.go index 1870b3b565d3..20230bf054b0 100644 --- a/exporter/dorisexporter/config_test.go +++ b/exporter/dorisexporter/config_test.go @@ -16,6 +16,7 @@ import ( "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dorisexporter/internal/metadata" @@ -87,7 +88,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/dorisexporter/go.mod b/exporter/dorisexporter/go.mod index c4b5f5dace66..e206b22959b6 100644 --- a/exporter/dorisexporter/go.mod +++ b/exporter/dorisexporter/go.mod @@ -21,6 +21,7 @@ require ( require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/semconv v0.119.1-0.20250210123122-44b3eeda354c ) diff --git a/exporter/dorisexporter/go.sum b/exporter/dorisexporter/go.sum index 703a26170d9d..26e1af1bb9d2 100644 --- a/exporter/dorisexporter/go.sum +++ b/exporter/dorisexporter/go.sum @@ -94,6 +94,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/elasticsearchexporter/config_test.go b/exporter/elasticsearchexporter/config_test.go index 23dae5eab05d..ec1e441313ad 100644 --- a/exporter/elasticsearchexporter/config_test.go +++ b/exporter/elasticsearchexporter/config_test.go @@ -17,6 +17,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterbatcher" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -339,7 +340,7 @@ func TestConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -427,7 +428,7 @@ func TestConfig_Validate(t *testing.T) { for name, tt := range tests { t.Run(name, func(t *testing.T) { - assert.ErrorContains(t, component.ValidateConfig(tt.config), tt.err) + assert.ErrorContains(t, xconfmap.Validate(tt.config), tt.err) }) } } @@ -436,13 +437,13 @@ func TestConfig_Validate_Environment(t *testing.T) { t.Run("valid", func(t *testing.T) { t.Setenv("ELASTICSEARCH_URL", "http://test:9200") config := withDefaultConfig() - err := component.ValidateConfig(config) + err := xconfmap.Validate(config) require.NoError(t, err) }) t.Run("invalid", func(t *testing.T) { t.Setenv("ELASTICSEARCH_URL", "http://valid:9200, *:!") config := withDefaultConfig() - err := component.ValidateConfig(config) + err := xconfmap.Validate(config) assert.ErrorContains(t, err, `invalid endpoint "*:!": parse "*:!": first path segment in URL cannot contain colon`) }) } diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index 5be3db6fd463..fbbb8f3fbca8 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index 3bada0d49c13..ce912cef233e 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -136,6 +136,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/elasticsearchexporter/integrationtest/go.mod b/exporter/elasticsearchexporter/integrationtest/go.mod index 00c11f7e38d3..930ce6b44371 100644 --- a/exporter/elasticsearchexporter/integrationtest/go.mod +++ b/exporter/elasticsearchexporter/integrationtest/go.mod @@ -150,7 +150,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/config/configtelemetry v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c // indirect - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 // indirect + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 // indirect go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/xconnector v0.119.1-0.20250210123122-44b3eeda354c // indirect diff --git a/exporter/elasticsearchexporter/integrationtest/go.sum b/exporter/elasticsearchexporter/integrationtest/go.sum index 072435139d10..5cae617937e8 100644 --- a/exporter/elasticsearchexporter/integrationtest/go.sum +++ b/exporter/elasticsearchexporter/integrationtest/go.sum @@ -321,8 +321,8 @@ go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:L go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c h1:M3yM3YZpZMjIjwAlynt7Acj0tscLuaeCwKy6K0hNzGo= go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:5xaAHjqx9mlcXxDCeUrZXkEfWk9suMqMKspK41XNelc= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 h1:BgAdd947V9z5fnOb3mQf/5UhFFA3dhYKdG78t4mWIuo= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c h1:mwG3+ASFnw01qNc1SM23L2OnFIoR3XaALy67ymuF3/o= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:rAzQkXy+CIR8N1bfc5Y1nQ2fhN1XyXWAKOKQ76c1Xuw= go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c h1:F0bQSB7lVDbcUy48XgCcDaVvNQvFa01AFGkGENm1mPo= diff --git a/exporter/fileexporter/config_test.go b/exporter/fileexporter/config_test.go index decd722763c4..9d7e6c8e20cc 100644 --- a/exporter/fileexporter/config_test.go +++ b/exporter/fileexporter/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter/internal/metadata" ) @@ -197,11 +198,11 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.expected == nil { - assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) + assert.EqualError(t, xconfmap.Validate(cfg), tt.errorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/fileexporter/go.mod b/exporter/fileexporter/go.mod index 6964ca1814a0..43a027a623eb 100644 --- a/exporter/fileexporter/go.mod +++ b/exporter/fileexporter/go.mod @@ -12,6 +12,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/fileexporter/go.sum b/exporter/fileexporter/go.sum index e361acaac420..63fd858523c7 100644 --- a/exporter/fileexporter/go.sum +++ b/exporter/fileexporter/go.sum @@ -70,6 +70,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/googlecloudpubsubexporter/exporter.go b/exporter/googlecloudpubsubexporter/exporter.go index f2b94d7cf4f3..94e31f261c9e 100644 --- a/exporter/googlecloudpubsubexporter/exporter.go +++ b/exporter/googlecloudpubsubexporter/exporter.go @@ -11,6 +11,7 @@ import ( "time" "cloud.google.com/go/pubsub/apiv1/pubsubpb" + "github.com/google/uuid" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/plog" diff --git a/exporter/googlecloudpubsubexporter/exporter_test.go b/exporter/googlecloudpubsubexporter/exporter_test.go index 829628f391ce..0c87bce2650b 100644 --- a/exporter/googlecloudpubsubexporter/exporter_test.go +++ b/exporter/googlecloudpubsubexporter/exporter_test.go @@ -9,6 +9,7 @@ import ( "testing" pb "cloud.google.com/go/pubsub/apiv1/pubsubpb" + "github.com/google/uuid" "github.com/googleapis/gax-go/v2" "github.com/stretchr/testify/assert" diff --git a/exporter/googlecloudpubsubexporter/publisher_client.go b/exporter/googlecloudpubsubexporter/publisher_client.go index 959136ef5649..989fd8862f7b 100644 --- a/exporter/googlecloudpubsubexporter/publisher_client.go +++ b/exporter/googlecloudpubsubexporter/publisher_client.go @@ -9,6 +9,7 @@ import ( pubsub "cloud.google.com/go/pubsub/apiv1" "cloud.google.com/go/pubsub/apiv1/pubsubpb" + "github.com/googleapis/gax-go/v2" "google.golang.org/api/option" "google.golang.org/grpc" diff --git a/exporter/googlecloudpubsubexporter/publisher_client_test.go b/exporter/googlecloudpubsubexporter/publisher_client_test.go index ff3370a5f264..42883fb3ef6f 100644 --- a/exporter/googlecloudpubsubexporter/publisher_client_test.go +++ b/exporter/googlecloudpubsubexporter/publisher_client_test.go @@ -8,6 +8,7 @@ import ( "testing" pubsub "cloud.google.com/go/pubsub/apiv1" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/api/option" diff --git a/exporter/honeycombmarkerexporter/config_test.go b/exporter/honeycombmarkerexporter/config_test.go index 4a1a59611bd4..bd9191772823 100644 --- a/exporter/honeycombmarkerexporter/config_test.go +++ b/exporter/honeycombmarkerexporter/config_test.go @@ -12,6 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/honeycombmarkerexporter/internal/metadata" @@ -90,12 +91,12 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.expected == nil { - err = component.ValidateConfig(cfg) + err = xconfmap.Validate(cfg) assert.Error(t, err) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/honeycombmarkerexporter/go.mod b/exporter/honeycombmarkerexporter/go.mod index 6330a06abfc2..08b436d3f9ba 100644 --- a/exporter/honeycombmarkerexporter/go.mod +++ b/exporter/honeycombmarkerexporter/go.mod @@ -22,6 +22,7 @@ require ( require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c ) diff --git a/exporter/honeycombmarkerexporter/go.sum b/exporter/honeycombmarkerexporter/go.sum index e9b9ea6fe2e4..628a05342503 100644 --- a/exporter/honeycombmarkerexporter/go.sum +++ b/exporter/honeycombmarkerexporter/go.sum @@ -121,6 +121,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/influxdbexporter/config_test.go b/exporter/influxdbexporter/config_test.go index 6459d4cad16a..3a6ffa9a55c4 100644 --- a/exporter/influxdbexporter/config_test.go +++ b/exporter/influxdbexporter/config_test.go @@ -16,6 +16,7 @@ import ( "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter/internal/metadata" @@ -77,7 +78,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod index 0cb9bf4f7671..939bd4914431 100644 --- a/exporter/influxdbexporter/go.mod +++ b/exporter/influxdbexporter/go.mod @@ -14,6 +14,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/influxdbexporter/go.sum b/exporter/influxdbexporter/go.sum index 27d7515a035b..b199aeddd913 100644 --- a/exporter/influxdbexporter/go.sum +++ b/exporter/influxdbexporter/go.sum @@ -115,6 +115,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/kafkaexporter/config_test.go b/exporter/kafkaexporter/config_test.go index 3264e996cbe5..18b3e6568873 100644 --- a/exporter/kafkaexporter/config_test.go +++ b/exporter/kafkaexporter/config_test.go @@ -16,6 +16,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter/internal/metadata" @@ -204,7 +205,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index 631290674088..5fc404694b62 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -21,6 +21,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/kafkaexporter/go.sum b/exporter/kafkaexporter/go.sum index a1c0a58c3ab6..b7dac56d6e04 100644 --- a/exporter/kafkaexporter/go.sum +++ b/exporter/kafkaexporter/go.sum @@ -169,6 +169,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/kineticaexporter/config_test.go b/exporter/kineticaexporter/config_test.go index d4726fe36970..7d3e43a9665c 100644 --- a/exporter/kineticaexporter/config_test.go +++ b/exporter/kineticaexporter/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" ) const defaultHost = "http://127.0.0.1:9191" @@ -42,7 +43,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/kineticaexporter/go.mod b/exporter/kineticaexporter/go.mod index 8abf161cb3aa..40e13dd91ad6 100644 --- a/exporter/kineticaexporter/go.mod +++ b/exporter/kineticaexporter/go.mod @@ -12,6 +12,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/exporter/kineticaexporter/go.sum b/exporter/kineticaexporter/go.sum index 083d39959a9b..6cd7faac7d32 100644 --- a/exporter/kineticaexporter/go.sum +++ b/exporter/kineticaexporter/go.sum @@ -92,6 +92,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/loadbalancingexporter/internal/metadata/generated_telemetry.go b/exporter/loadbalancingexporter/internal/metadata/generated_telemetry.go index a64a758d4428..44ca8f346ae6 100644 --- a/exporter/loadbalancingexporter/internal/metadata/generated_telemetry.go +++ b/exporter/loadbalancingexporter/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/exporter/loadbalancingexporter/internal/metadata/generated_telemetry_test.go b/exporter/loadbalancingexporter/internal/metadata/generated_telemetry_test.go index 813a551209f6..f110b853dc73 100644 --- a/exporter/loadbalancingexporter/internal/metadata/generated_telemetry_test.go +++ b/exporter/loadbalancingexporter/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/exporter/loadbalancingexporter/internal/metadatatest/generated_telemetrytest_test.go b/exporter/loadbalancingexporter/internal/metadatatest/generated_telemetrytest_test.go index 151189d66b18..b8a69d31f683 100644 --- a/exporter/loadbalancingexporter/internal/metadatatest/generated_telemetrytest_test.go +++ b/exporter/loadbalancingexporter/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/exporter/loadbalancingexporter/resolver_k8s.go b/exporter/loadbalancingexporter/resolver_k8s.go index 040eb8120814..6086d11e3c3e 100644 --- a/exporter/loadbalancingexporter/resolver_k8s.go +++ b/exporter/loadbalancingexporter/resolver_k8s.go @@ -26,9 +26,10 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/utils/ptr" "k8s.io/utils/strings/slices" - "sigs.k8s.io/controller-runtime/pkg/client/config" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter/internal/metadata" + + "sigs.k8s.io/controller-runtime/pkg/client/config" ) var _ resolver = (*k8sResolver)(nil) diff --git a/exporter/logicmonitorexporter/config_test.go b/exporter/logicmonitorexporter/config_test.go index 2791854b0f7c..8f697673a110 100644 --- a/exporter/logicmonitorexporter/config_test.go +++ b/exporter/logicmonitorexporter/config_test.go @@ -16,6 +16,7 @@ import ( "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logicmonitorexporter/internal/metadata" @@ -153,7 +154,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/logicmonitorexporter/go.mod b/exporter/logicmonitorexporter/go.mod index bdc373342be7..326e2a5d6eaa 100644 --- a/exporter/logicmonitorexporter/go.mod +++ b/exporter/logicmonitorexporter/go.mod @@ -12,6 +12,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/logicmonitorexporter/go.sum b/exporter/logicmonitorexporter/go.sum index 61cf4a01e7b0..817447dc7cdb 100644 --- a/exporter/logicmonitorexporter/go.sum +++ b/exporter/logicmonitorexporter/go.sum @@ -90,6 +90,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/lokiexporter/config_test.go b/exporter/lokiexporter/config_test.go index f9ee4470fc63..c17751330d7a 100644 --- a/exporter/lokiexporter/config_test.go +++ b/exporter/lokiexporter/config_test.go @@ -18,6 +18,7 @@ import ( "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter/internal/metadata" @@ -85,7 +86,7 @@ func TestLoadConfigNewExporter(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index 425f831205d5..ce4150ba9d75 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -18,6 +18,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index a891b9bba807..a84ef019f4f4 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -146,6 +146,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/lokiexporter/internal/metadata/generated_telemetry.go b/exporter/lokiexporter/internal/metadata/generated_telemetry.go index 64afa0efdf17..e570a1ddc37c 100644 --- a/exporter/lokiexporter/internal/metadata/generated_telemetry.go +++ b/exporter/lokiexporter/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/exporter/lokiexporter/internal/metadata/generated_telemetry_test.go b/exporter/lokiexporter/internal/metadata/generated_telemetry_test.go index 7d2808159ab4..94fb209c8cb9 100644 --- a/exporter/lokiexporter/internal/metadata/generated_telemetry_test.go +++ b/exporter/lokiexporter/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/exporter/lokiexporter/internal/metadatatest/generated_telemetrytest_test.go b/exporter/lokiexporter/internal/metadatatest/generated_telemetrytest_test.go index 115fd2ceafc5..2960f6409bc5 100644 --- a/exporter/lokiexporter/internal/metadatatest/generated_telemetrytest_test.go +++ b/exporter/lokiexporter/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/exporter/mezmoexporter/config_test.go b/exporter/mezmoexporter/config_test.go index aa2e9b789e84..661619952ca2 100644 --- a/exporter/mezmoexporter/config_test.go +++ b/exporter/mezmoexporter/config_test.go @@ -16,6 +16,7 @@ import ( "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter/internal/metadata" @@ -78,7 +79,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/mezmoexporter/go.mod b/exporter/mezmoexporter/go.mod index babbd5afbd88..750b739e2cf4 100644 --- a/exporter/mezmoexporter/go.mod +++ b/exporter/mezmoexporter/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/exporter/mezmoexporter/go.sum b/exporter/mezmoexporter/go.sum index d9c8dd85b21e..80add0e92593 100644 --- a/exporter/mezmoexporter/go.sum +++ b/exporter/mezmoexporter/go.sum @@ -88,6 +88,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/opencensusexporter/config_test.go b/exporter/opencensusexporter/config_test.go index f3b8fc991dff..f0576db2b03e 100644 --- a/exporter/opencensusexporter/config_test.go +++ b/exporter/opencensusexporter/config_test.go @@ -16,6 +16,7 @@ import ( "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter/internal/metadata" @@ -85,7 +86,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index 9869e89001a1..7de8aa891f13 100644 --- a/exporter/opencensusexporter/go.mod +++ b/exporter/opencensusexporter/go.mod @@ -15,6 +15,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/opencensusexporter/go.sum b/exporter/opencensusexporter/go.sum index 0ae50102257b..effeff3e512e 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -136,6 +136,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/opensearchexporter/config_test.go b/exporter/opensearchexporter/config_test.go index 921ce1a00428..7125a610d249 100644 --- a/exporter/opensearchexporter/config_test.go +++ b/exporter/opensearchexporter/config_test.go @@ -16,6 +16,7 @@ import ( "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter/internal/metadata" ) @@ -124,7 +125,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - vv := component.ValidateConfig(cfg) + vv := xconfmap.Validate(cfg) tt.configValidateAssert(t, vv) assert.Equal(t, tt.expected, cfg) }) diff --git a/exporter/opensearchexporter/go.mod b/exporter/opensearchexporter/go.mod index 90a7e4d482bf..7109f70921a0 100644 --- a/exporter/opensearchexporter/go.mod +++ b/exporter/opensearchexporter/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/opensearchexporter/go.sum b/exporter/opensearchexporter/go.sum index 2e06d85bcebd..39bbeca918d2 100644 --- a/exporter/opensearchexporter/go.sum +++ b/exporter/opensearchexporter/go.sum @@ -118,6 +118,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/otelarrowexporter/config_test.go b/exporter/otelarrowexporter/config_test.go index 7ad1a0a633b5..f19a67e3dba9 100644 --- a/exporter/otelarrowexporter/config_test.go +++ b/exporter/otelarrowexporter/config_test.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterbatcher" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -138,7 +139,7 @@ func TestDefaultConfigValid(t *testing.T) { // this must be set by the user and config // validation always checks that a value is set. cfg.(*Config).Arrow.MaxStreamLifetime = 2 * time.Second - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) } func TestArrowConfigPayloadCompressionZstd(t *testing.T) { diff --git a/exporter/otelarrowexporter/go.mod b/exporter/otelarrowexporter/go.mod index 333f51a7dbf8..ec56743906ef 100644 --- a/exporter/otelarrowexporter/go.mod +++ b/exporter/otelarrowexporter/go.mod @@ -18,6 +18,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/otelarrowexporter/go.sum b/exporter/otelarrowexporter/go.sum index 4fe30c115cb9..dc404d20d8a9 100644 --- a/exporter/otelarrowexporter/go.sum +++ b/exporter/otelarrowexporter/go.sum @@ -131,6 +131,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/prometheusexporter/config_test.go b/exporter/prometheusexporter/config_test.go index c0d8b0ff1dc7..dca1788ad61d 100644 --- a/exporter/prometheusexporter/config_test.go +++ b/exporter/prometheusexporter/config_test.go @@ -14,6 +14,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter/internal/metadata" ) @@ -66,7 +67,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index 9763190f1fbb..39f1683c0eb5 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -16,6 +16,7 @@ require ( go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/prometheusexporter/go.sum b/exporter/prometheusexporter/go.sum index 09d00be09410..1952b2adcbbc 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -600,8 +600,8 @@ go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:L go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c h1:M3yM3YZpZMjIjwAlynt7Acj0tscLuaeCwKy6K0hNzGo= go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:5xaAHjqx9mlcXxDCeUrZXkEfWk9suMqMKspK41XNelc= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 h1:BgAdd947V9z5fnOb3mQf/5UhFFA3dhYKdG78t4mWIuo= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c h1:mwG3+ASFnw01qNc1SM23L2OnFIoR3XaALy67ymuF3/o= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:rAzQkXy+CIR8N1bfc5Y1nQ2fhN1XyXWAKOKQ76c1Xuw= go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c h1:F0bQSB7lVDbcUy48XgCcDaVvNQvFa01AFGkGENm1mPo= diff --git a/exporter/prometheusremotewriteexporter/config_test.go b/exporter/prometheusremotewriteexporter/config_test.go index cc851f68fb33..7293e29c3e3b 100644 --- a/exporter/prometheusremotewriteexporter/config_test.go +++ b/exporter/prometheusremotewriteexporter/config_test.go @@ -17,6 +17,7 @@ import ( "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter/internal/metadata" @@ -107,10 +108,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.expected == nil { - assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) + assert.EqualError(t, xconfmap.Validate(cfg), tt.errorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index b1ddc225c3a8..4a802bd6e291 100644 --- a/exporter/prometheusremotewriteexporter/go.mod +++ b/exporter/prometheusremotewriteexporter/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/prometheusremotewriteexporter/go.sum b/exporter/prometheusremotewriteexporter/go.sum index 23d33a3bd1c4..f526cf87e1ba 100644 --- a/exporter/prometheusremotewriteexporter/go.sum +++ b/exporter/prometheusremotewriteexporter/go.sum @@ -110,6 +110,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/prometheusremotewriteexporter/internal/metadata/generated_telemetry.go b/exporter/prometheusremotewriteexporter/internal/metadata/generated_telemetry.go index a74a9863d8ea..a2f729f55d46 100644 --- a/exporter/prometheusremotewriteexporter/internal/metadata/generated_telemetry.go +++ b/exporter/prometheusremotewriteexporter/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/exporter/prometheusremotewriteexporter/internal/metadata/generated_telemetry_test.go b/exporter/prometheusremotewriteexporter/internal/metadata/generated_telemetry_test.go index 8d1a898b5da1..72ca59b6b3d3 100644 --- a/exporter/prometheusremotewriteexporter/internal/metadata/generated_telemetry_test.go +++ b/exporter/prometheusremotewriteexporter/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/exporter/prometheusremotewriteexporter/internal/metadatatest/generated_telemetrytest_test.go b/exporter/prometheusremotewriteexporter/internal/metadatatest/generated_telemetrytest_test.go index 52ae92a4992c..fae94c753c4f 100644 --- a/exporter/prometheusremotewriteexporter/internal/metadatatest/generated_telemetrytest_test.go +++ b/exporter/prometheusremotewriteexporter/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/exporter/pulsarexporter/config_test.go b/exporter/pulsarexporter/config_test.go index 02cef15496a2..6ba0249f0f81 100644 --- a/exporter/pulsarexporter/config_test.go +++ b/exporter/pulsarexporter/config_test.go @@ -15,6 +15,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter/internal/metadata" @@ -84,7 +85,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/pulsarexporter/go.mod b/exporter/pulsarexporter/go.mod index e5a15666032d..ac0a9a74882e 100644 --- a/exporter/pulsarexporter/go.mod +++ b/exporter/pulsarexporter/go.mod @@ -15,6 +15,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/pulsarexporter/go.sum b/exporter/pulsarexporter/go.sum index 096bd2b7e132..d6c03c41ed2b 100644 --- a/exporter/pulsarexporter/go.sum +++ b/exporter/pulsarexporter/go.sum @@ -232,6 +232,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/rabbitmqexporter/config_test.go b/exporter/rabbitmqexporter/config_test.go index 503d971a300a..398e48542746 100644 --- a/exporter/rabbitmqexporter/config_test.go +++ b/exporter/rabbitmqexporter/config_test.go @@ -15,6 +15,7 @@ import ( "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/rabbitmqexporter/internal/metadata" ) @@ -107,12 +108,12 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.expected == nil { - err = errors.Join(err, component.ValidateConfig(cfg)) + err = errors.Join(err, xconfmap.Validate(cfg)) assert.ErrorContains(t, err, tt.errorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/rabbitmqexporter/go.mod b/exporter/rabbitmqexporter/go.mod index 315cd7d8434f..ca8ddd73eb78 100644 --- a/exporter/rabbitmqexporter/go.mod +++ b/exporter/rabbitmqexporter/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/rabbitmqexporter/go.sum b/exporter/rabbitmqexporter/go.sum index 2f07ad983993..ff5fb3e041bd 100644 --- a/exporter/rabbitmqexporter/go.sum +++ b/exporter/rabbitmqexporter/go.sum @@ -150,6 +150,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/sapmexporter/config_test.go b/exporter/sapmexporter/config_test.go index 099fbe2e3453..887ea6005af9 100644 --- a/exporter/sapmexporter/config_test.go +++ b/exporter/sapmexporter/config_test.go @@ -14,6 +14,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter/internal/metadata" @@ -78,7 +79,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -116,5 +117,5 @@ func TestInvalidConfig(t *testing.T) { }, } - require.Error(t, component.ValidateConfig(invalid)) + require.Error(t, xconfmap.Validate(invalid)) } diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index c576a4462562..00d544da2bf6 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -17,6 +17,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index a0dbc296cf1c..232ce38e7750 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -83,6 +83,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/sentryexporter/config_test.go b/exporter/sentryexporter/config_test.go index 3769b1f1ca95..a6b1a6093c3f 100644 --- a/exporter/sentryexporter/config_test.go +++ b/exporter/sentryexporter/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter/internal/metadata" ) @@ -47,7 +48,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index a17da2fd5b1a..7dfbb476f2b8 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index f062ce3173e5..c77c7640aba8 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -72,6 +72,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/signalfxexporter/config_test.go b/exporter/signalfxexporter/config_test.go index 0a60a9aff521..b95f0aaa25d2 100644 --- a/exporter/signalfxexporter/config_test.go +++ b/exporter/signalfxexporter/config_test.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "go.uber.org/zap" @@ -295,7 +296,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) // We need to add the default exclude rules. assert.NoError(t, setDefaultExcludes(tt.expected)) assert.Equal(t, tt.expected, cfg) @@ -533,7 +534,7 @@ func TestConfigValidateErrors(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - assert.Error(t, component.ValidateConfig(tt.cfg)) + assert.Error(t, xconfmap.Validate(tt.cfg)) }) } } diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index 16dcf6f91ae2..d8a06b1d596a 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -25,6 +25,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index a2a1805d766e..7c9e597e6c73 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -125,6 +125,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/splunkhecexporter/config_test.go b/exporter/splunkhecexporter/config_test.go index 6f03f955c9cb..c99b70aebe06 100644 --- a/exporter/splunkhecexporter/config_test.go +++ b/exporter/splunkhecexporter/config_test.go @@ -16,6 +16,7 @@ import ( "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterbatcher" "go.opentelemetry.io/collector/exporter/exporterhelper" @@ -146,7 +147,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -242,7 +243,7 @@ func TestConfig_Validate(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - err := component.ValidateConfig(tt.cfg) + err := xconfmap.Validate(tt.cfg) if tt.wantErr == "" { require.NoError(t, err) } else { diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index c2d19eb1b2e2..6bdf05599fe0 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -19,6 +19,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index fe2cef6809c0..1775057c1392 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -166,6 +166,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/splunkhecexporter/internal/metadata/generated_telemetry_test.go b/exporter/splunkhecexporter/internal/metadata/generated_telemetry_test.go index e1d0d3866490..557126e2066d 100644 --- a/exporter/splunkhecexporter/internal/metadata/generated_telemetry_test.go +++ b/exporter/splunkhecexporter/internal/metadata/generated_telemetry_test.go @@ -6,14 +6,13 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" ) type mockMeter struct { diff --git a/exporter/sumologicexporter/config_test.go b/exporter/sumologicexporter/config_test.go index aca10aedfb4d..7fc84330e91e 100644 --- a/exporter/sumologicexporter/config_test.go +++ b/exporter/sumologicexporter/config_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/confmap/xconfmap" ) func TestInitExporterInvalidConfiguration(t *testing.T) { @@ -68,7 +68,7 @@ func TestInitExporterInvalidConfiguration(t *testing.T) { for _, tc := range testcases { t.Run(tc.name, func(t *testing.T) { - err := component.ValidateConfig(tc.cfg) + err := xconfmap.Validate(tc.cfg) if tc.expectedError != nil { assert.EqualError(t, err, tc.expectedError.Error()) diff --git a/exporter/sumologicexporter/factory_test.go b/exporter/sumologicexporter/factory_test.go index 7c04db07663e..9769e30bc612 100644 --- a/exporter/sumologicexporter/factory_test.go +++ b/exporter/sumologicexporter/factory_test.go @@ -12,6 +12,7 @@ import ( "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configretry" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter/internal/metadata" @@ -45,5 +46,5 @@ func TestCreateDefaultConfig(t *testing.T) { QueueSettings: qs, }, cfg) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) } diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index c04760bb985a..6bd1031f69a1 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -14,6 +14,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index 80f704704cd6..338fca2fe804 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -107,6 +107,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/sumologicexporter/internal/metadata/generated_telemetry.go b/exporter/sumologicexporter/internal/metadata/generated_telemetry.go index 51d216e05c57..e31f095c624c 100644 --- a/exporter/sumologicexporter/internal/metadata/generated_telemetry.go +++ b/exporter/sumologicexporter/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/exporter/sumologicexporter/internal/metadata/generated_telemetry_test.go b/exporter/sumologicexporter/internal/metadata/generated_telemetry_test.go index 56f300a2abe0..bcf16d0ed889 100644 --- a/exporter/sumologicexporter/internal/metadata/generated_telemetry_test.go +++ b/exporter/sumologicexporter/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/exporter/sumologicexporter/internal/metadatatest/generated_telemetrytest_test.go b/exporter/sumologicexporter/internal/metadatatest/generated_telemetrytest_test.go index 3ac80f7c4edb..896876519812 100644 --- a/exporter/sumologicexporter/internal/metadatatest/generated_telemetrytest_test.go +++ b/exporter/sumologicexporter/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sumologicexporter/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/exporter/tencentcloudlogserviceexporter/config_test.go b/exporter/tencentcloudlogserviceexporter/config_test.go index 0136ab86923a..ce0d4655095e 100644 --- a/exporter/tencentcloudlogserviceexporter/config_test.go +++ b/exporter/tencentcloudlogserviceexporter/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter/internal/metadata" ) @@ -46,7 +47,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/tencentcloudlogserviceexporter/go.mod b/exporter/tencentcloudlogserviceexporter/go.mod index ad6f2a6e17e2..1aff0833c368 100644 --- a/exporter/tencentcloudlogserviceexporter/go.mod +++ b/exporter/tencentcloudlogserviceexporter/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/exporter/tencentcloudlogserviceexporter/go.sum b/exporter/tencentcloudlogserviceexporter/go.sum index 4110f7d7d778..96caee955f12 100644 --- a/exporter/tencentcloudlogserviceexporter/go.sum +++ b/exporter/tencentcloudlogserviceexporter/go.sum @@ -76,6 +76,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/exporter/zipkinexporter/config_test.go b/exporter/zipkinexporter/config_test.go index 262f6e0c86d2..2bc38c65db6f 100644 --- a/exporter/zipkinexporter/config_test.go +++ b/exporter/zipkinexporter/config_test.go @@ -16,6 +16,7 @@ import ( "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter/internal/metadata" @@ -82,7 +83,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index a5de97ad0457..2b6c9a7e258b 100644 --- a/exporter/zipkinexporter/go.mod +++ b/exporter/zipkinexporter/go.mod @@ -15,6 +15,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/exporter/zipkinexporter/go.sum b/exporter/zipkinexporter/go.sum index 9916f3394e5e..98cc1cfb2a07 100644 --- a/exporter/zipkinexporter/go.sum +++ b/exporter/zipkinexporter/go.sum @@ -101,6 +101,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/extension/asapauthextension/config_test.go b/extension/asapauthextension/config_test.go index e92a2636990f..e13a3abf78d7 100644 --- a/extension/asapauthextension/config_test.go +++ b/extension/asapauthextension/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension/internal/metadata" ) @@ -71,10 +72,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) if tt.expectedErr != nil { - assert.ErrorIs(t, component.ValidateConfig(cfg), tt.expectedErr) + assert.ErrorIs(t, xconfmap.Validate(cfg), tt.expectedErr) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/asapauthextension/extension.go b/extension/asapauthextension/extension.go index 19f8f764c694..9b5e263d7b3f 100644 --- a/extension/asapauthextension/extension.go +++ b/extension/asapauthextension/extension.go @@ -9,6 +9,7 @@ import ( "net/http" "bitbucket.org/atlassian/go-asap/v2" + "github.com/SermoDigital/jose/crypto" "go.opentelemetry.io/collector/extension/auth" "google.golang.org/grpc/credentials" diff --git a/extension/asapauthextension/extension_test.go b/extension/asapauthextension/extension_test.go index 865a1a76ec25..50376ba6059d 100644 --- a/extension/asapauthextension/extension_test.go +++ b/extension/asapauthextension/extension_test.go @@ -10,6 +10,7 @@ import ( "time" "bitbucket.org/atlassian/go-asap/v2" + "github.com/stretchr/testify/assert" ) diff --git a/extension/asapauthextension/go.mod b/extension/asapauthextension/go.mod index 909b287a401b..e0a90bf547c4 100644 --- a/extension/asapauthextension/go.mod +++ b/extension/asapauthextension/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/auth v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/extension/asapauthextension/go.sum b/extension/asapauthextension/go.sum index a54b29a8dca7..a865c8643121 100644 --- a/extension/asapauthextension/go.sum +++ b/extension/asapauthextension/go.sum @@ -62,6 +62,8 @@ go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3e go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:sW0t0iI/VfRL9VYX7Ik6XzVgPcR+Y5kejTLsYcMyDWs= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qJ07BdPHd7x6vgUeGH8LjC0+0jGD71T0za9vbnzqNHI= go.opentelemetry.io/collector/extension/auth v0.119.1-0.20250210123122-44b3eeda354c h1:D8vXuJnkJ7aIRko3RytgoLgHOpXnwy7pnQrvHOiObV0= diff --git a/extension/awsproxy/config_test.go b/extension/awsproxy/config_test.go index 9c105525a819..5e8357a233f1 100644 --- a/extension/awsproxy/config_test.go +++ b/extension/awsproxy/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy/internal/metadata" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy" @@ -59,7 +60,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/awsproxy/go.mod b/extension/awsproxy/go.mod index 670f315485f5..6cf0954d573a 100644 --- a/extension/awsproxy/go.mod +++ b/extension/awsproxy/go.mod @@ -12,6 +12,7 @@ require ( go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c go.uber.org/zap v1.27.0 diff --git a/extension/awsproxy/go.sum b/extension/awsproxy/go.sum index 664e68b2ac0b..1283c3f80483 100644 --- a/extension/awsproxy/go.sum +++ b/extension/awsproxy/go.sum @@ -67,6 +67,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qJ07BdPHd7x6vgUeGH8LjC0+0jGD71T0za9vbnzqNHI= go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c h1:iDBzCm38IfZB6EXMSnRwV0CI0jJi81tX4yIpztbmtBY= diff --git a/extension/basicauthextension/config_test.go b/extension/basicauthextension/config_test.go index cd2d843f0afe..cb9e5a153e60 100644 --- a/extension/basicauthextension/config_test.go +++ b/extension/basicauthextension/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension/internal/metadata" ) @@ -59,10 +60,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) if tt.expectedErr { - assert.Error(t, component.ValidateConfig(cfg)) + assert.Error(t, xconfmap.Validate(cfg)) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/basicauthextension/go.mod b/extension/basicauthextension/go.mod index e2634bd1d8a6..52cc0cf5c29c 100644 --- a/extension/basicauthextension/go.mod +++ b/extension/basicauthextension/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/auth v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/extension/basicauthextension/go.sum b/extension/basicauthextension/go.sum index e7b82ca44208..f50ca0bd6d5d 100644 --- a/extension/basicauthextension/go.sum +++ b/extension/basicauthextension/go.sum @@ -61,6 +61,8 @@ go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3e go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:sW0t0iI/VfRL9VYX7Ik6XzVgPcR+Y5kejTLsYcMyDWs= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= diff --git a/extension/bearertokenauthextension/config_test.go b/extension/bearertokenauthextension/config_test.go index d739fcf86825..e2c62e2cde9a 100644 --- a/extension/bearertokenauthextension/config_test.go +++ b/extension/bearertokenauthextension/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension/internal/metadata" ) @@ -52,10 +53,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) if tt.expectedErr { - assert.Error(t, component.ValidateConfig(cfg)) + assert.Error(t, xconfmap.Validate(cfg)) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/bearertokenauthextension/go.mod b/extension/bearertokenauthextension/go.mod index d64f3766f567..849ba3137f7d 100644 --- a/extension/bearertokenauthextension/go.mod +++ b/extension/bearertokenauthextension/go.mod @@ -9,6 +9,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/auth v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/extension/bearertokenauthextension/go.sum b/extension/bearertokenauthextension/go.sum index 6e68eacdde95..3d657d4aa181 100644 --- a/extension/bearertokenauthextension/go.sum +++ b/extension/bearertokenauthextension/go.sum @@ -51,6 +51,8 @@ go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3e go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:sW0t0iI/VfRL9VYX7Ik6XzVgPcR+Y5kejTLsYcMyDWs= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qJ07BdPHd7x6vgUeGH8LjC0+0jGD71T0za9vbnzqNHI= go.opentelemetry.io/collector/extension/auth v0.119.1-0.20250210123122-44b3eeda354c h1:D8vXuJnkJ7aIRko3RytgoLgHOpXnwy7pnQrvHOiObV0= diff --git a/extension/cgroupruntimeextension/config_test.go b/extension/cgroupruntimeextension/config_test.go index 653102e0601b..874c2cd0d108 100644 --- a/extension/cgroupruntimeextension/config_test.go +++ b/extension/cgroupruntimeextension/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/cgroupruntimeextension/internal/metadata" ) @@ -70,11 +71,11 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.validateErrorMessage != "" { - assert.EqualError(t, component.ValidateConfig(cfg), tt.validateErrorMessage) + assert.EqualError(t, xconfmap.Validate(cfg), tt.validateErrorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/cgroupruntimeextension/go.mod b/extension/cgroupruntimeextension/go.mod index 76ed235daa9f..950dd1b29371 100644 --- a/extension/cgroupruntimeextension/go.mod +++ b/extension/cgroupruntimeextension/go.mod @@ -9,6 +9,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c go.uber.org/automaxprocs v1.6.0 diff --git a/extension/cgroupruntimeextension/go.sum b/extension/cgroupruntimeextension/go.sum index aaa9ac62e103..193f192b2ab1 100644 --- a/extension/cgroupruntimeextension/go.sum +++ b/extension/cgroupruntimeextension/go.sum @@ -55,6 +55,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qJ07BdPHd7x6vgUeGH8LjC0+0jGD71T0za9vbnzqNHI= go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c h1:iDBzCm38IfZB6EXMSnRwV0CI0jJi81tX4yIpztbmtBY= diff --git a/extension/headerssetterextension/config_test.go b/extension/headerssetterextension/config_test.go index cfdef96f024c..9fd02278c997 100644 --- a/extension/headerssetterextension/config_test.go +++ b/extension/headerssetterextension/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension/internal/metadata" ) @@ -76,10 +77,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.expectedError != nil { - assert.ErrorIs(t, component.ValidateConfig(cfg), tt.expectedError) + assert.ErrorIs(t, xconfmap.Validate(cfg), tt.expectedError) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/headerssetterextension/go.mod b/extension/headerssetterextension/go.mod index 4ef5e8c60a8c..515f12272ec7 100644 --- a/extension/headerssetterextension/go.mod +++ b/extension/headerssetterextension/go.mod @@ -8,6 +8,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/auth v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/extension/headerssetterextension/go.sum b/extension/headerssetterextension/go.sum index 1412ead89ddc..111fed459c8c 100644 --- a/extension/headerssetterextension/go.sum +++ b/extension/headerssetterextension/go.sum @@ -55,6 +55,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= diff --git a/extension/healthcheckextension/config_test.go b/extension/healthcheckextension/config_test.go index ba4fb69d0fb2..78cc7e7ec1e2 100644 --- a/extension/healthcheckextension/config_test.go +++ b/extension/healthcheckextension/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension/internal/metadata" ) @@ -70,10 +71,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) if tt.expectedErr != nil { - assert.ErrorIs(t, component.ValidateConfig(cfg), tt.expectedErr) + assert.ErrorIs(t, xconfmap.Validate(cfg), tt.expectedErr) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index fa72d8e5c5ce..82d9eb2330ca 100644 --- a/extension/healthcheckextension/go.mod +++ b/extension/healthcheckextension/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensioncapabilities v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/extension/healthcheckextension/go.sum b/extension/healthcheckextension/go.sum index 226c9148e64a..d82fdf402791 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -81,6 +81,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= diff --git a/extension/healthcheckv2extension/config_test.go b/extension/healthcheckv2extension/config_test.go index 82904769dd93..625cba97bce7 100644 --- a/extension/healthcheckv2extension/config_test.go +++ b/extension/healthcheckv2extension/config_test.go @@ -16,6 +16,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension/internal/common" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension/internal/grpc" @@ -182,10 +183,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) if tt.expectedErr != nil { - assert.ErrorIs(t, component.ValidateConfig(cfg), tt.expectedErr) + assert.ErrorIs(t, xconfmap.Validate(cfg), tt.expectedErr) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/healthcheckv2extension/go.mod b/extension/healthcheckv2extension/go.mod index 4a6e1a2c83aa..5f8562f3cce8 100644 --- a/extension/healthcheckv2extension/go.mod +++ b/extension/healthcheckv2extension/go.mod @@ -14,6 +14,7 @@ require ( go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensioncapabilities v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/extension/healthcheckv2extension/go.sum b/extension/healthcheckv2extension/go.sum index 88722912d051..e78b3f8411c6 100644 --- a/extension/healthcheckv2extension/go.sum +++ b/extension/healthcheckv2extension/go.sum @@ -87,6 +87,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= diff --git a/extension/httpforwarderextension/config_test.go b/extension/httpforwarderextension/config_test.go index 62ac93e2cecf..30fe6b39171e 100644 --- a/extension/httpforwarderextension/config_test.go +++ b/extension/httpforwarderextension/config_test.go @@ -14,6 +14,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarderextension/internal/metadata" ) @@ -59,7 +60,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/httpforwarderextension/go.mod b/extension/httpforwarderextension/go.mod index 82adfa0d1b57..84479ee0c2d1 100644 --- a/extension/httpforwarderextension/go.mod +++ b/extension/httpforwarderextension/go.mod @@ -12,6 +12,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c go.uber.org/goleak v1.3.0 diff --git a/extension/httpforwarderextension/go.sum b/extension/httpforwarderextension/go.sum index 9c7268ce81ef..0000300966c5 100644 --- a/extension/httpforwarderextension/go.sum +++ b/extension/httpforwarderextension/go.sum @@ -81,6 +81,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= diff --git a/extension/jaegerremotesampling/config_test.go b/extension/jaegerremotesampling/config_test.go index 22ccf9bf08a7..49be1219549a 100644 --- a/extension/jaegerremotesampling/config_test.go +++ b/extension/jaegerremotesampling/config_test.go @@ -15,6 +15,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling/internal/metadata" ) @@ -65,7 +66,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/jaegerremotesampling/go.mod b/extension/jaegerremotesampling/go.mod index 5559bdd974f7..af9d69903813 100644 --- a/extension/jaegerremotesampling/go.mod +++ b/extension/jaegerremotesampling/go.mod @@ -17,6 +17,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/featuregate v1.25.1-0.20250210123122-44b3eeda354c diff --git a/extension/jaegerremotesampling/go.sum b/extension/jaegerremotesampling/go.sum index 2dd111ae66f7..1191875f051b 100644 --- a/extension/jaegerremotesampling/go.sum +++ b/extension/jaegerremotesampling/go.sum @@ -98,6 +98,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= diff --git a/extension/oauth2clientauthextension/config_test.go b/extension/oauth2clientauthextension/config_test.go index a7d4fd5b9c53..a326ad7f8c54 100644 --- a/extension/oauth2clientauthextension/config_test.go +++ b/extension/oauth2clientauthextension/config_test.go @@ -14,6 +14,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension/internal/metadata" ) @@ -82,10 +83,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) if tt.expectedErr != nil { - assert.ErrorIs(t, component.ValidateConfig(cfg), tt.expectedErr) + assert.ErrorIs(t, xconfmap.Validate(cfg), tt.expectedErr) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/oauth2clientauthextension/go.mod b/extension/oauth2clientauthextension/go.mod index 61129a4e946e..8fd5e6e6be06 100644 --- a/extension/oauth2clientauthextension/go.mod +++ b/extension/oauth2clientauthextension/go.mod @@ -9,6 +9,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/auth v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/extension/oauth2clientauthextension/go.sum b/extension/oauth2clientauthextension/go.sum index aa2b9484ead6..319b0e3bd221 100644 --- a/extension/oauth2clientauthextension/go.sum +++ b/extension/oauth2clientauthextension/go.sum @@ -55,6 +55,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qJ07BdPHd7x6vgUeGH8LjC0+0jGD71T0za9vbnzqNHI= go.opentelemetry.io/collector/extension/auth v0.119.1-0.20250210123122-44b3eeda354c h1:D8vXuJnkJ7aIRko3RytgoLgHOpXnwy7pnQrvHOiObV0= diff --git a/extension/observer/cfgardenobserver/config_test.go b/extension/observer/cfgardenobserver/config_test.go index e747d003c218..a30867a4b7bc 100644 --- a/extension/observer/cfgardenobserver/config_test.go +++ b/extension/observer/cfgardenobserver/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/cfgardenobserver/internal/metadata" ) @@ -115,7 +116,7 @@ func TestLoadConfig(t *testing.T) { for _, tt := range tests { t.Run(tt.id.String(), func(t *testing.T) { cfg := loadConfig(t, tt.id) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/observer/cfgardenobserver/extension.go b/extension/observer/cfgardenobserver/extension.go index 5e247ab19a1e..d4ed550e203e 100644 --- a/extension/observer/cfgardenobserver/extension.go +++ b/extension/observer/cfgardenobserver/extension.go @@ -15,6 +15,7 @@ import ( "code.cloudfoundry.org/garden" gardenClient "code.cloudfoundry.org/garden/client" gardenConnection "code.cloudfoundry.org/garden/client/connection" + "github.com/cloudfoundry/go-cfclient/v3/client" "github.com/cloudfoundry/go-cfclient/v3/config" "github.com/cloudfoundry/go-cfclient/v3/resource" diff --git a/extension/observer/cfgardenobserver/extension_test.go b/extension/observer/cfgardenobserver/extension_test.go index 5bbdc5cea5d2..da9f8a45e21e 100644 --- a/extension/observer/cfgardenobserver/extension_test.go +++ b/extension/observer/cfgardenobserver/extension_test.go @@ -8,6 +8,7 @@ import ( "testing" "code.cloudfoundry.org/garden" + "github.com/cloudfoundry/go-cfclient/v3/resource" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" diff --git a/extension/observer/cfgardenobserver/go.mod b/extension/observer/cfgardenobserver/go.mod index 62dea32d6550..85d239d685d0 100644 --- a/extension/observer/cfgardenobserver/go.mod +++ b/extension/observer/cfgardenobserver/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c go.uber.org/goleak v1.3.0 diff --git a/extension/observer/cfgardenobserver/go.sum b/extension/observer/cfgardenobserver/go.sum index 74e5480e2886..8ccc2f550ed6 100644 --- a/extension/observer/cfgardenobserver/go.sum +++ b/extension/observer/cfgardenobserver/go.sum @@ -86,6 +86,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qJ07BdPHd7x6vgUeGH8LjC0+0jGD71T0za9vbnzqNHI= go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c h1:iDBzCm38IfZB6EXMSnRwV0CI0jJi81tX4yIpztbmtBY= diff --git a/extension/observer/dockerobserver/config_test.go b/extension/observer/dockerobserver/config_test.go index 9022e4139535..ece08f501885 100644 --- a/extension/observer/dockerobserver/config_test.go +++ b/extension/observer/dockerobserver/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver/internal/metadata" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker" @@ -52,9 +53,9 @@ func TestLoadConfig(t *testing.T) { t.Run(tt.id.String(), func(t *testing.T) { cfg := loadConfig(t, tt.id) if tt.expectedError != "" { - assert.ErrorContains(t, component.ValidateConfig(cfg), tt.expectedError) + assert.ErrorContains(t, xconfmap.Validate(cfg), tt.expectedError) } else { - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) } assert.Equal(t, tt.expected, cfg) }) @@ -63,19 +64,19 @@ func TestLoadConfig(t *testing.T) { func TestValidateConfig(t *testing.T) { cfg := &Config{Config: docker.Config{DockerAPIVersion: "1.24", Timeout: 5 * time.Second}, CacheSyncInterval: 5 * time.Second} - assert.ErrorContains(t, component.ValidateConfig(cfg), "endpoint must be specified") + assert.ErrorContains(t, xconfmap.Validate(cfg), "endpoint must be specified") cfg = &Config{Config: docker.Config{Endpoint: "someEndpoint", DockerAPIVersion: "1.23"}} - assert.ErrorContains(t, component.ValidateConfig(cfg), `"api_version" 1.23 must be at least 1.24`) + assert.ErrorContains(t, xconfmap.Validate(cfg), `"api_version" 1.23 must be at least 1.24`) cfg = &Config{Config: docker.Config{Endpoint: "someEndpoint", DockerAPIVersion: version}} - assert.ErrorContains(t, component.ValidateConfig(cfg), "timeout must be specified") + assert.ErrorContains(t, xconfmap.Validate(cfg), "timeout must be specified") cfg = &Config{Config: docker.Config{Endpoint: "someEndpoint", DockerAPIVersion: version, Timeout: 5 * time.Minute}} - assert.ErrorContains(t, component.ValidateConfig(cfg), "cache_sync_interval must be specified") + assert.ErrorContains(t, xconfmap.Validate(cfg), "cache_sync_interval must be specified") cfg = &Config{Config: docker.Config{Endpoint: "someEndpoint", DockerAPIVersion: version, Timeout: 5 * time.Minute}, CacheSyncInterval: 5 * time.Minute} - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) } func loadConf(tb testing.TB, path string, id component.ID) *confmap.Conf { diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod index 40b27d119df6..aa6c9d940cee 100644 --- a/extension/observer/dockerobserver/go.mod +++ b/extension/observer/dockerobserver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c go.uber.org/goleak v1.3.0 diff --git a/extension/observer/dockerobserver/go.sum b/extension/observer/dockerobserver/go.sum index 830e3acf0fe6..ecb32a4a4d89 100644 --- a/extension/observer/dockerobserver/go.sum +++ b/extension/observer/dockerobserver/go.sum @@ -137,6 +137,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qJ07BdPHd7x6vgUeGH8LjC0+0jGD71T0za9vbnzqNHI= go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c h1:iDBzCm38IfZB6EXMSnRwV0CI0jJi81tX4yIpztbmtBY= diff --git a/extension/observer/ecsobserver/config_test.go b/extension/observer/ecsobserver/config_test.go index c838cea10edf..c805b726b95c 100644 --- a/extension/observer/ecsobserver/config_test.go +++ b/extension/observer/ecsobserver/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver/internal/metadata" ) @@ -67,10 +68,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) if tt.expectedErr { - assert.Error(t, component.ValidateConfig(cfg)) + assert.Error(t, xconfmap.Validate(cfg)) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod index 74a3f38a615d..a303f942b206 100644 --- a/extension/observer/ecsobserver/go.mod +++ b/extension/observer/ecsobserver/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component/componentstatus v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c go.uber.org/goleak v1.3.0 diff --git a/extension/observer/ecsobserver/go.sum b/extension/observer/ecsobserver/go.sum index e078bb55dd7d..9563527f0e5f 100644 --- a/extension/observer/ecsobserver/go.sum +++ b/extension/observer/ecsobserver/go.sum @@ -59,6 +59,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qJ07BdPHd7x6vgUeGH8LjC0+0jGD71T0za9vbnzqNHI= go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c h1:iDBzCm38IfZB6EXMSnRwV0CI0jJi81tX4yIpztbmtBY= diff --git a/extension/observer/ecstaskobserver/config_test.go b/extension/observer/ecstaskobserver/config_test.go index e28ae3af9c7b..cfed47d735a4 100644 --- a/extension/observer/ecstaskobserver/config_test.go +++ b/extension/observer/ecstaskobserver/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver/internal/metadata" ) @@ -61,10 +62,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) if tt.expectedErr != "" { - assert.EqualError(t, component.ValidateConfig(cfg), tt.expectedErr) + assert.EqualError(t, xconfmap.Validate(cfg), tt.expectedErr) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/observer/ecstaskobserver/go.mod b/extension/observer/ecstaskobserver/go.mod index 3405a48b81c1..9f4330ce59a5 100644 --- a/extension/observer/ecstaskobserver/go.mod +++ b/extension/observer/ecstaskobserver/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c go.uber.org/goleak v1.3.0 diff --git a/extension/observer/ecstaskobserver/go.sum b/extension/observer/ecstaskobserver/go.sum index 0d549a877559..071b522a757e 100644 --- a/extension/observer/ecstaskobserver/go.sum +++ b/extension/observer/ecstaskobserver/go.sum @@ -79,6 +79,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= diff --git a/extension/observer/hostobserver/config_test.go b/extension/observer/hostobserver/config_test.go index 12f04b01a925..5b9910463971 100644 --- a/extension/observer/hostobserver/config_test.go +++ b/extension/observer/hostobserver/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver/internal/metadata" ) @@ -44,7 +45,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index a533bc871534..c703541704a0 100644 --- a/extension/observer/hostobserver/go.mod +++ b/extension/observer/hostobserver/go.mod @@ -9,6 +9,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c go.uber.org/goleak v1.3.0 diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index 5d35741d83c5..d572dc85c926 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -66,6 +66,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qJ07BdPHd7x6vgUeGH8LjC0+0jGD71T0za9vbnzqNHI= go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c h1:iDBzCm38IfZB6EXMSnRwV0CI0jJi81tX4yIpztbmtBY= diff --git a/extension/observer/k8sobserver/config_test.go b/extension/observer/k8sobserver/config_test.go index d8eebf7e8601..f07dd0370820 100644 --- a/extension/observer/k8sobserver/config_test.go +++ b/extension/observer/k8sobserver/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver/internal/metadata" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" @@ -66,10 +67,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) if tt.expectedErr != "" { - assert.ErrorContains(t, component.ValidateConfig(cfg), tt.expectedErr) + assert.ErrorContains(t, xconfmap.Validate(cfg), tt.expectedErr) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index 3898ea3c0cd4..6234d75d61d1 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -9,6 +9,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c go.uber.org/goleak v1.3.0 diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index b9d8869bcddc..56162bfe814b 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -262,6 +262,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qJ07BdPHd7x6vgUeGH8LjC0+0jGD71T0za9vbnzqNHI= go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c h1:iDBzCm38IfZB6EXMSnRwV0CI0jJi81tX4yIpztbmtBY= diff --git a/extension/pprofextension/config_test.go b/extension/pprofextension/config_test.go index a46d009b4c49..4881f57082b1 100644 --- a/extension/pprofextension/config_test.go +++ b/extension/pprofextension/config_test.go @@ -12,6 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension/internal/metadata" ) @@ -46,7 +47,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/pprofextension/go.mod b/extension/pprofextension/go.mod index 8014c887c2e7..57651f93ba5b 100644 --- a/extension/pprofextension/go.mod +++ b/extension/pprofextension/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c go.uber.org/goleak v1.3.0 diff --git a/extension/pprofextension/go.sum b/extension/pprofextension/go.sum index d5493eef05b6..936bc29bec28 100644 --- a/extension/pprofextension/go.sum +++ b/extension/pprofextension/go.sum @@ -53,6 +53,8 @@ go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:ZppUH1hgUJOubawEsxsQ9MzEYFytqo2GnVSS7d4CVxc= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qJ07BdPHd7x6vgUeGH8LjC0+0jGD71T0za9vbnzqNHI= go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c h1:iDBzCm38IfZB6EXMSnRwV0CI0jJi81tX4yIpztbmtBY= diff --git a/extension/pprofextension/pprofextension.go b/extension/pprofextension/pprofextension.go index 830305b49947..71a8b8a3566e 100644 --- a/extension/pprofextension/pprofextension.go +++ b/extension/pprofextension/pprofextension.go @@ -8,7 +8,7 @@ import ( "errors" "net" "net/http" - _ "net/http/pprof" // #nosec Needed to enable the performance profiler + _ "net/http/pprof" "os" "runtime" "runtime/pprof" @@ -17,6 +17,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componentstatus" "go.uber.org/zap" + // #nosec Needed to enable the performance profiler ) var running = &atomic.Bool{} diff --git a/extension/sigv4authextension/config_test.go b/extension/sigv4authextension/config_test.go index c5a473c11f0b..15705a4b2600 100644 --- a/extension/sigv4authextension/config_test.go +++ b/extension/sigv4authextension/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension/internal/metadata" ) @@ -31,7 +32,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, &Config{ Region: "region", Service: "service", @@ -52,5 +53,5 @@ func TestLoadConfigError(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(metadata.Type, "missing_credentials").String()) require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.Error(t, component.ValidateConfig(cfg)) + assert.Error(t, xconfmap.Validate(cfg)) } diff --git a/extension/sigv4authextension/go.mod b/extension/sigv4authextension/go.mod index 5706a844065e..a806f768f99d 100644 --- a/extension/sigv4authextension/go.mod +++ b/extension/sigv4authextension/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/auth v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/extension/sigv4authextension/go.sum b/extension/sigv4authextension/go.sum index 2af4d9c1325d..c7f5060f22f2 100644 --- a/extension/sigv4authextension/go.sum +++ b/extension/sigv4authextension/go.sum @@ -73,6 +73,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qJ07BdPHd7x6vgUeGH8LjC0+0jGD71T0za9vbnzqNHI= go.opentelemetry.io/collector/extension/auth v0.119.1-0.20250210123122-44b3eeda354c h1:D8vXuJnkJ7aIRko3RytgoLgHOpXnwy7pnQrvHOiObV0= diff --git a/extension/solarwindsapmsettingsextension/config_test.go b/extension/solarwindsapmsettingsextension/config_test.go index dfe8832012b6..947d0bd39b4e 100644 --- a/extension/solarwindsapmsettingsextension/config_test.go +++ b/extension/solarwindsapmsettingsextension/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension/internal/metadata" ) @@ -268,7 +269,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/solarwindsapmsettingsextension/go.mod b/extension/solarwindsapmsettingsextension/go.mod index 1da56a783cd8..3b4671ce2a1e 100644 --- a/extension/solarwindsapmsettingsextension/go.mod +++ b/extension/solarwindsapmsettingsextension/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configgrpc v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c go.uber.org/goleak v1.3.0 diff --git a/extension/solarwindsapmsettingsextension/go.sum b/extension/solarwindsapmsettingsextension/go.sum index 53f59c6e6bba..c14be08137a6 100644 --- a/extension/solarwindsapmsettingsextension/go.sum +++ b/extension/solarwindsapmsettingsextension/go.sum @@ -79,6 +79,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= diff --git a/extension/storage/filestorage/config_test.go b/extension/storage/filestorage/config_test.go index 8fad1509698f..2002b1538d6b 100644 --- a/extension/storage/filestorage/config_test.go +++ b/extension/storage/filestorage/config_test.go @@ -15,6 +15,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/extension" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage/internal/metadata" @@ -66,7 +67,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -77,7 +78,7 @@ func TestHandleNonExistingDirectoryWithAnError(t *testing.T) { cfg := f.CreateDefaultConfig().(*Config) cfg.Directory = "/not/a/dir" - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) require.Error(t, err) require.True(t, strings.HasPrefix(err.Error(), "directory must exist: ")) } @@ -95,7 +96,7 @@ func TestHandleProvidingFilePathAsDirWithAnError(t *testing.T) { cfg.Directory = file.Name() - err = component.ValidateConfig(cfg) + err = xconfmap.Validate(cfg) require.Error(t, err) require.EqualError(t, err, file.Name()+" is not a directory") } @@ -267,7 +268,7 @@ func TestCompactionDirectory(t *testing.T) { } for _, test := range tests { t.Run(test.name, func(t *testing.T) { - require.ErrorIs(t, component.ValidateConfig(test.config(t)), test.err) + require.ErrorIs(t, xconfmap.Validate(test.config(t)), test.err) }) } } diff --git a/extension/storage/filestorage/go.mod b/extension/storage/filestorage/go.mod index f49bf8093745..70997693182f 100644 --- a/extension/storage/filestorage/go.mod +++ b/extension/storage/filestorage/go.mod @@ -9,6 +9,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/xextension v0.119.1-0.20250210123122-44b3eeda354c diff --git a/extension/storage/filestorage/go.sum b/extension/storage/filestorage/go.sum index 0b26b396038d..4da4b9bf6867 100644 --- a/extension/storage/filestorage/go.sum +++ b/extension/storage/filestorage/go.sum @@ -49,6 +49,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qJ07BdPHd7x6vgUeGH8LjC0+0jGD71T0za9vbnzqNHI= go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c h1:iDBzCm38IfZB6EXMSnRwV0CI0jJi81tX4yIpztbmtBY= diff --git a/extension/storage/redisstorageextension/config_test.go b/extension/storage/redisstorageextension/config_test.go index 6ea05a88535c..5cfdae62cff8 100644 --- a/extension/storage/redisstorageextension/config_test.go +++ b/extension/storage/redisstorageextension/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/redisstorageextension/internal/metadata" ) @@ -51,7 +52,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(&cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/storage/redisstorageextension/go.mod b/extension/storage/redisstorageextension/go.mod index 798316f57e57..0f7a2e3093c2 100644 --- a/extension/storage/redisstorageextension/go.mod +++ b/extension/storage/redisstorageextension/go.mod @@ -9,6 +9,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/xextension v0.119.1-0.20250210123122-44b3eeda354c diff --git a/extension/storage/redisstorageextension/go.sum b/extension/storage/redisstorageextension/go.sum index 040c238c4946..c84546757ff1 100644 --- a/extension/storage/redisstorageextension/go.sum +++ b/extension/storage/redisstorageextension/go.sum @@ -59,6 +59,8 @@ go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3e go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:sW0t0iI/VfRL9VYX7Ik6XzVgPcR+Y5kejTLsYcMyDWs= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qJ07BdPHd7x6vgUeGH8LjC0+0jGD71T0za9vbnzqNHI= go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c h1:iDBzCm38IfZB6EXMSnRwV0CI0jJi81tX4yIpztbmtBY= diff --git a/extension/sumologicextension/factory_test.go b/extension/sumologicextension/factory_test.go index b5b4972c88c5..cf8a173c01f6 100644 --- a/extension/sumologicextension/factory_test.go +++ b/extension/sumologicextension/factory_test.go @@ -12,8 +12,8 @@ import ( "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/extension" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension/credentials" @@ -36,7 +36,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { }, }, cfg) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) ccfg := cfg.(*Config) ccfg.CollectorName = "test_collector" diff --git a/extension/sumologicextension/go.mod b/extension/sumologicextension/go.mod index dd58eb605a68..f408cc1e3015 100644 --- a/extension/sumologicextension/go.mod +++ b/extension/sumologicextension/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/auth v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/featuregate v1.25.1-0.20250210123122-44b3eeda354c @@ -27,12 +28,18 @@ require ( github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect + github.com/go-viper/mapstructure/v2 v2.2.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/klauspost/compress v1.17.11 // indirect + github.com/knadh/koanf/maps v0.1.1 // indirect + github.com/knadh/koanf/providers/confmap v0.1.0 // indirect + github.com/knadh/koanf/v2 v2.1.2 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pierrec/lz4/v4 v4.1.22 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect @@ -45,6 +52,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/config/configcompression v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c // indirect + go.opentelemetry.io/collector/confmap v1.25.0 // indirect go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect go.opentelemetry.io/otel v1.34.0 // indirect diff --git a/extension/sumologicextension/go.sum b/extension/sumologicextension/go.sum index 439d83669de3..ca73f96e0f98 100644 --- a/extension/sumologicextension/go.sum +++ b/extension/sumologicextension/go.sum @@ -17,6 +17,8 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss= +github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -36,12 +38,22 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= +github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= +github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= +github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= +github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= +github.com/knadh/koanf/v2 v2.1.2 h1:I2rtLRqXRy1p01m/utEtpZSSA6dcJbgGVuE27kW2PzQ= +github.com/knadh/koanf/v2 v2.1.2/go.mod h1:Gphfaen0q1Fc1HTgJgSTC4oRX9R2R5ErYMZJy8fLJBo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= +github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= +github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= +github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= @@ -86,6 +98,10 @@ go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3e go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:sW0t0iI/VfRL9VYX7Ik6XzVgPcR+Y5kejTLsYcMyDWs= go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c h1:F2MffZ1aWmosk0ANMZHnvG5V6qKJgcoU8RZPdch2x5g= go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= +go.opentelemetry.io/collector/confmap v1.25.0 h1:dLqd6hF4JqcDHl5GWWhc2jXsHs3hkq3KPvU/2Nw5aN4= +go.opentelemetry.io/collector/confmap v1.25.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.0 h1:qCJa7Hh7lY3vYWgwcEgTGSjjITLCn+BSsya8LxjpoPY= go.opentelemetry.io/collector/consumer v1.25.0/go.mod h1:ToBfr3BexnhHuxC8/XszkKP/YtkgsGd0yjFMQXNwvT8= go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c h1:9koiLXtEcu3pNTWokNI7/p+kGoPFb20OB7fPwHY516o= diff --git a/internal/kubelet/client.go b/internal/kubelet/client.go index eda1b97c2d25..5bd7b8296194 100644 --- a/internal/kubelet/client.go +++ b/internal/kubelet/client.go @@ -14,11 +14,12 @@ import ( "strings" "go.uber.org/zap" - "k8s.io/client-go/rest" - "k8s.io/client-go/transport" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/sanitize" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" + + "k8s.io/client-go/rest" + "k8s.io/client-go/transport" ) const ( diff --git a/internal/kubelet/client_test.go b/internal/kubelet/client_test.go index 952de83db29b..6969d6681c4d 100644 --- a/internal/kubelet/client_test.go +++ b/internal/kubelet/client_test.go @@ -23,9 +23,10 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/config/configtls" "go.uber.org/zap" - "k8s.io/client-go/tools/clientcmd" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" + + "k8s.io/client-go/tools/clientcmd" ) const ( diff --git a/internal/otelarrow/go.sum b/internal/otelarrow/go.sum index 4d4caae18577..1ef063af9ea3 100644 --- a/internal/otelarrow/go.sum +++ b/internal/otelarrow/go.sum @@ -133,6 +133,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/internal/otelarrow/internal/metadata/generated_telemetry.go b/internal/otelarrow/internal/metadata/generated_telemetry.go index 2b62f332712a..7423db78fba4 100644 --- a/internal/otelarrow/internal/metadata/generated_telemetry.go +++ b/internal/otelarrow/internal/metadata/generated_telemetry.go @@ -7,11 +7,10 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/embedded" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/internal/otelarrow/internal/metadata/generated_telemetry_test.go b/internal/otelarrow/internal/metadata/generated_telemetry_test.go index a23e1167e3a9..f91aa4cd2f65 100644 --- a/internal/otelarrow/internal/metadata/generated_telemetry_test.go +++ b/internal/otelarrow/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/internal/otelarrow/internal/metadatatest/generated_telemetrytest_test.go b/internal/otelarrow/internal/metadatatest/generated_telemetrytest_test.go index 17a9a5bfcdd2..7495683310e9 100644 --- a/internal/otelarrow/internal/metadatatest/generated_telemetrytest_test.go +++ b/internal/otelarrow/internal/metadatatest/generated_telemetrytest_test.go @@ -7,13 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/otelarrow/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/pkg/datadog/config/config_test.go b/pkg/datadog/config/config_test.go index a5db98302203..8dd48b0860f7 100644 --- a/pkg/datadog/config/config_test.go +++ b/pkg/datadog/config/config_test.go @@ -20,6 +20,7 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" ) @@ -728,7 +729,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/pkg/datadog/go.mod b/pkg/datadog/go.mod index 3d90233e192e..ba99b3cfdc69 100644 --- a/pkg/datadog/go.mod +++ b/pkg/datadog/go.mod @@ -15,6 +15,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/featuregate v1.25.1-0.20250210123122-44b3eeda354c go.uber.org/zap v1.27.0 diff --git a/pkg/datadog/go.sum b/pkg/datadog/go.sum index 8f028475dc4b..44eede4daa38 100644 --- a/pkg/datadog/go.sum +++ b/pkg/datadog/go.sum @@ -136,6 +136,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/pkg/golden/README.md b/pkg/golden/README.md index b574f5e3c424..8695e3747528 100644 --- a/pkg/golden/README.md +++ b/pkg/golden/README.md @@ -31,7 +31,7 @@ necessary to ensure the function is removed after the golden file is written. ```go func TestScraper(t *testing.T) { cfg := createDefaultConfig().(*Config) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) scraper := newScraper(componenttest.NewNopReceiverCreateSettings(), cfg) diff --git a/pkg/stanza/fileconsumer/internal/metadata/generated_telemetry.go b/pkg/stanza/fileconsumer/internal/metadata/generated_telemetry.go index e30be32da7ad..f02f4c82eb51 100644 --- a/pkg/stanza/fileconsumer/internal/metadata/generated_telemetry.go +++ b/pkg/stanza/fileconsumer/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/pkg/stanza/fileconsumer/internal/metadata/generated_telemetry_test.go b/pkg/stanza/fileconsumer/internal/metadata/generated_telemetry_test.go index 1b7c89fb0f78..0b8453ecf875 100644 --- a/pkg/stanza/fileconsumer/internal/metadata/generated_telemetry_test.go +++ b/pkg/stanza/fileconsumer/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/pkg/stanza/fileconsumer/internal/metadatatest/generated_telemetrytest_test.go b/pkg/stanza/fileconsumer/internal/metadatatest/generated_telemetrytest_test.go index dddfa7ccaed9..cec935797f66 100644 --- a/pkg/stanza/fileconsumer/internal/metadatatest/generated_telemetrytest_test.go +++ b/pkg/stanza/fileconsumer/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/processor/attributesprocessor/config_test.go b/processor/attributesprocessor/config_test.go index bb37cab77391..5d8ed1487762 100644 --- a/processor/attributesprocessor/config_test.go +++ b/processor/attributesprocessor/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/attraction" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterconfig" @@ -211,7 +212,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/attributesprocessor/factory_test.go b/processor/attributesprocessor/factory_test.go index 72a26027ba52..d4b0902e59c6 100644 --- a/processor/attributesprocessor/factory_test.go +++ b/processor/attributesprocessor/factory_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/processor/processortest" @@ -33,7 +33,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { func TestValidateConfig(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - assert.Error(t, component.ValidateConfig(cfg)) + assert.Error(t, xconfmap.Validate(cfg)) } func TestFactoryCreateTraces_InvalidActions(t *testing.T) { diff --git a/processor/attributesprocessor/go.mod b/processor/attributesprocessor/go.mod index 622d2f9c640a..caacde6f3ddb 100644 --- a/processor/attributesprocessor/go.mod +++ b/processor/attributesprocessor/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/processor/attributesprocessor/go.sum b/processor/attributesprocessor/go.sum index 440992660a66..6c1d3820b50e 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/go.sum @@ -101,6 +101,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c h1:ErvHovgDePqXULwMtxVQcFGIPm1KqCrz+R8XK7752wI= diff --git a/processor/cumulativetodeltaprocessor/config_test.go b/processor/cumulativetodeltaprocessor/config_test.go index 337c2fc13c37..2564cb9a962e 100644 --- a/processor/cumulativetodeltaprocessor/config_test.go +++ b/processor/cumulativetodeltaprocessor/config_test.go @@ -13,6 +13,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterset" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor/internal/metadata" @@ -163,10 +164,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.expected == nil { - assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) + assert.EqualError(t, xconfmap.Validate(cfg), tt.errorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/cumulativetodeltaprocessor/go.mod b/processor/cumulativetodeltaprocessor/go.mod index a89e62e8525c..0f8c741e50b6 100644 --- a/processor/cumulativetodeltaprocessor/go.mod +++ b/processor/cumulativetodeltaprocessor/go.mod @@ -9,6 +9,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/processor/cumulativetodeltaprocessor/go.sum b/processor/cumulativetodeltaprocessor/go.sum index 53ca5625e6db..4870480d198f 100644 --- a/processor/cumulativetodeltaprocessor/go.sum +++ b/processor/cumulativetodeltaprocessor/go.sum @@ -64,6 +64,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c h1:ErvHovgDePqXULwMtxVQcFGIPm1KqCrz+R8XK7752wI= diff --git a/processor/deltatocumulativeprocessor/config_test.go b/processor/deltatocumulativeprocessor/config_test.go index 371afcc05c0d..479fa955c4c5 100644 --- a/processor/deltatocumulativeprocessor/config_test.go +++ b/processor/deltatocumulativeprocessor/config_test.go @@ -13,6 +13,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/metadata" ) @@ -59,7 +60,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/deltatocumulativeprocessor/go.mod b/processor/deltatocumulativeprocessor/go.mod index 6f2e46eee315..2feb084ee04c 100644 --- a/processor/deltatocumulativeprocessor/go.mod +++ b/processor/deltatocumulativeprocessor/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/processor/deltatocumulativeprocessor/go.sum b/processor/deltatocumulativeprocessor/go.sum index 310807609b44..c091b1063253 100644 --- a/processor/deltatocumulativeprocessor/go.sum +++ b/processor/deltatocumulativeprocessor/go.sum @@ -62,6 +62,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c h1:ErvHovgDePqXULwMtxVQcFGIPm1KqCrz+R8XK7752wI= diff --git a/processor/deltatocumulativeprocessor/internal/metadata/generated_telemetry.go b/processor/deltatocumulativeprocessor/internal/metadata/generated_telemetry.go index 3f5a3845c15b..8a29306c4e63 100644 --- a/processor/deltatocumulativeprocessor/internal/metadata/generated_telemetry.go +++ b/processor/deltatocumulativeprocessor/internal/metadata/generated_telemetry.go @@ -7,11 +7,10 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/embedded" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/processor/deltatocumulativeprocessor/internal/metadata/generated_telemetry_test.go b/processor/deltatocumulativeprocessor/internal/metadata/generated_telemetry_test.go index 72c9d3fd624c..f1d5b023aebc 100644 --- a/processor/deltatocumulativeprocessor/internal/metadata/generated_telemetry_test.go +++ b/processor/deltatocumulativeprocessor/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/processor/deltatocumulativeprocessor/internal/metadatatest/generated_telemetrytest_test.go b/processor/deltatocumulativeprocessor/internal/metadatatest/generated_telemetrytest_test.go index 184c472fea45..e6fbc0e90691 100644 --- a/processor/deltatocumulativeprocessor/internal/metadatatest/generated_telemetrytest_test.go +++ b/processor/deltatocumulativeprocessor/internal/metadatatest/generated_telemetrytest_test.go @@ -7,13 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/processor/deltatorateprocessor/config_test.go b/processor/deltatorateprocessor/config_test.go index 05a1cb797db4..882c00b5bde4 100644 --- a/processor/deltatorateprocessor/config_test.go +++ b/processor/deltatorateprocessor/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor/internal/metadata" ) @@ -51,10 +52,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.expected == nil { - assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) + assert.EqualError(t, xconfmap.Validate(cfg), tt.errorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/deltatorateprocessor/go.mod b/processor/deltatorateprocessor/go.mod index 8d9f4a5800d7..85c99f563ee2 100644 --- a/processor/deltatorateprocessor/go.mod +++ b/processor/deltatorateprocessor/go.mod @@ -7,6 +7,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/processor/deltatorateprocessor/go.sum b/processor/deltatorateprocessor/go.sum index 500024f8f256..74d17c74f05b 100644 --- a/processor/deltatorateprocessor/go.sum +++ b/processor/deltatorateprocessor/go.sum @@ -60,6 +60,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/processor/filterprocessor/config_test.go b/processor/filterprocessor/config_test.go index d009cdd739a0..254817c4d259 100644 --- a/processor/filterprocessor/config_test.go +++ b/processor/filterprocessor/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/pdata/plog" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterconfig" @@ -89,7 +90,7 @@ func TestLoadingConfigStrict(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -171,7 +172,7 @@ func TestLoadingConfigStrictLogs(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -233,7 +234,7 @@ func TestLoadingConfigSeverityLogsStrict(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -295,7 +296,7 @@ func TestLoadingConfigSeverityLogsRegexp(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -357,7 +358,7 @@ func TestLoadingConfigBodyLogsStrict(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -419,7 +420,7 @@ func TestLoadingConfigBodyLogsRegexp(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -484,7 +485,7 @@ func TestLoadingConfigMinSeverityNumberLogs(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -573,7 +574,7 @@ func TestLoadingConfigRegexp(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -623,7 +624,7 @@ func TestLoadingSpans(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -708,7 +709,7 @@ func TestLoadingConfigExpr(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -915,12 +916,12 @@ func TestLoadingConfigOTTL(t *testing.T) { if tt.expected == nil { if tt.errorMessage != "" { - assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) + assert.EqualError(t, xconfmap.Validate(cfg), tt.errorMessage) } else { - assert.Error(t, component.ValidateConfig(cfg)) + assert.Error(t, xconfmap.Validate(cfg)) } } else { - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) } }) diff --git a/processor/filterprocessor/go.mod b/processor/filterprocessor/go.mod index 6e41161b8981..128d2daa321a 100644 --- a/processor/filterprocessor/go.mod +++ b/processor/filterprocessor/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/processor/filterprocessor/go.sum b/processor/filterprocessor/go.sum index a50b6dcae0b7..5ba1a30a7bec 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/go.sum @@ -99,6 +99,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c h1:ErvHovgDePqXULwMtxVQcFGIPm1KqCrz+R8XK7752wI= diff --git a/processor/filterprocessor/internal/metadata/generated_telemetry.go b/processor/filterprocessor/internal/metadata/generated_telemetry.go index cb8a19e2fb28..8bff18847692 100644 --- a/processor/filterprocessor/internal/metadata/generated_telemetry.go +++ b/processor/filterprocessor/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/processor/filterprocessor/internal/metadata/generated_telemetry_test.go b/processor/filterprocessor/internal/metadata/generated_telemetry_test.go index e963b837d3c2..7a1688640a47 100644 --- a/processor/filterprocessor/internal/metadata/generated_telemetry_test.go +++ b/processor/filterprocessor/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/processor/filterprocessor/internal/metadatatest/generated_telemetrytest_test.go b/processor/filterprocessor/internal/metadatatest/generated_telemetrytest_test.go index 9696bc77288c..dcc7c369ee91 100644 --- a/processor/filterprocessor/internal/metadatatest/generated_telemetrytest_test.go +++ b/processor/filterprocessor/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/processor/geoipprocessor/config_test.go b/processor/geoipprocessor/config_test.go index 746b210685fc..7191ccf81808 100644 --- a/processor/geoipprocessor/config_test.go +++ b/processor/geoipprocessor/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/otelcol/otelcoltest" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/geoipprocessor/internal/metadata" @@ -78,11 +79,11 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.validateErrorMessage != "" { - assert.EqualError(t, component.ValidateConfig(cfg), tt.validateErrorMessage) + assert.EqualError(t, xconfmap.Validate(cfg), tt.validateErrorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/geoipprocessor/go.mod b/processor/geoipprocessor/go.mod index 747cf8eeeab1..9b8129a9d8a9 100644 --- a/processor/geoipprocessor/go.mod +++ b/processor/geoipprocessor/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/otelcol/otelcoltest v0.119.1-0.20250210123122-44b3eeda354c @@ -73,7 +74,6 @@ require ( go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 // indirect go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/xconnector v0.119.1-0.20250210123122-44b3eeda354c // indirect diff --git a/processor/groupbyattrsprocessor/config_test.go b/processor/groupbyattrsprocessor/config_test.go index e5fd565797ed..646275d63aad 100644 --- a/processor/groupbyattrsprocessor/config_test.go +++ b/processor/groupbyattrsprocessor/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor/internal/metadata" ) @@ -48,7 +49,7 @@ func TestLoadingConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index 253a2a3ca596..c0f985df5941 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -8,6 +8,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index 5e46b35b4b8f..e411d5fa0a5b 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -62,6 +62,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c h1:ErvHovgDePqXULwMtxVQcFGIPm1KqCrz+R8XK7752wI= diff --git a/processor/groupbyattrsprocessor/internal/metadata/generated_telemetry.go b/processor/groupbyattrsprocessor/internal/metadata/generated_telemetry.go index 507919b2ac66..116b21f38f1d 100644 --- a/processor/groupbyattrsprocessor/internal/metadata/generated_telemetry.go +++ b/processor/groupbyattrsprocessor/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/processor/groupbyattrsprocessor/internal/metadata/generated_telemetry_test.go b/processor/groupbyattrsprocessor/internal/metadata/generated_telemetry_test.go index 2ddc375e5d6b..9e1ff753cf58 100644 --- a/processor/groupbyattrsprocessor/internal/metadata/generated_telemetry_test.go +++ b/processor/groupbyattrsprocessor/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/processor/groupbyattrsprocessor/internal/metadatatest/generated_telemetrytest_test.go b/processor/groupbyattrsprocessor/internal/metadatatest/generated_telemetrytest_test.go index aab96ab376d1..3bf1a4d74fca 100644 --- a/processor/groupbyattrsprocessor/internal/metadatatest/generated_telemetrytest_test.go +++ b/processor/groupbyattrsprocessor/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/processor/groupbytraceprocessor/internal/metadata/generated_telemetry.go b/processor/groupbytraceprocessor/internal/metadata/generated_telemetry.go index fc0683fe98f6..a60f85d1141b 100644 --- a/processor/groupbytraceprocessor/internal/metadata/generated_telemetry.go +++ b/processor/groupbytraceprocessor/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/processor/groupbytraceprocessor/internal/metadata/generated_telemetry_test.go b/processor/groupbytraceprocessor/internal/metadata/generated_telemetry_test.go index b379ef6221dc..495305de3ddf 100644 --- a/processor/groupbytraceprocessor/internal/metadata/generated_telemetry_test.go +++ b/processor/groupbytraceprocessor/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/processor/groupbytraceprocessor/internal/metadatatest/generated_telemetrytest_test.go b/processor/groupbytraceprocessor/internal/metadatatest/generated_telemetrytest_test.go index a9092d9d98a0..b679b9136a79 100644 --- a/processor/groupbytraceprocessor/internal/metadatatest/generated_telemetrytest_test.go +++ b/processor/groupbytraceprocessor/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/processor/k8sattributesprocessor/config_test.go b/processor/k8sattributesprocessor/config_test.go index db8ae337737c..fb452190e0d2 100644 --- a/processor/k8sattributesprocessor/config_test.go +++ b/processor/k8sattributesprocessor/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/featuregate" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" @@ -228,11 +229,11 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.expected == nil { - err = component.ValidateConfig(cfg) + err = xconfmap.Validate(cfg) assert.Error(t, err) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index c247e8a7550a..a2da8ae02d99 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -15,6 +15,7 @@ require ( go.opentelemetry.io/collector/component/componentstatus v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/xconsumer v0.119.1-0.20250210123122-44b3eeda354c diff --git a/processor/k8sattributesprocessor/internal/metadata/generated_telemetry.go b/processor/k8sattributesprocessor/internal/metadata/generated_telemetry.go index e1044275c3db..baf4d434be38 100644 --- a/processor/k8sattributesprocessor/internal/metadata/generated_telemetry.go +++ b/processor/k8sattributesprocessor/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/processor/k8sattributesprocessor/internal/metadata/generated_telemetry_test.go b/processor/k8sattributesprocessor/internal/metadata/generated_telemetry_test.go index 7dce31df5124..e93e184e2495 100644 --- a/processor/k8sattributesprocessor/internal/metadata/generated_telemetry_test.go +++ b/processor/k8sattributesprocessor/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/processor/k8sattributesprocessor/internal/metadatatest/generated_telemetrytest_test.go b/processor/k8sattributesprocessor/internal/metadatatest/generated_telemetrytest_test.go index 98d5f90b4aca..1fab3080eb27 100644 --- a/processor/k8sattributesprocessor/internal/metadatatest/generated_telemetrytest_test.go +++ b/processor/k8sattributesprocessor/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/processor/metricsgenerationprocessor/config_test.go b/processor/metricsgenerationprocessor/config_test.go index f40b0cdda319..1b998b176422 100644 --- a/processor/metricsgenerationprocessor/config_test.go +++ b/processor/metricsgenerationprocessor/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor/internal/metadata" ) @@ -97,10 +98,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.expected == nil { - assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) + assert.EqualError(t, xconfmap.Validate(cfg), tt.errorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/metricsgenerationprocessor/go.mod b/processor/metricsgenerationprocessor/go.mod index d0edd8ec5cc4..90d34f09a508 100644 --- a/processor/metricsgenerationprocessor/go.mod +++ b/processor/metricsgenerationprocessor/go.mod @@ -9,6 +9,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/featuregate v1.25.1-0.20250210123122-44b3eeda354c diff --git a/processor/metricsgenerationprocessor/go.sum b/processor/metricsgenerationprocessor/go.sum index 3ab87837fafd..7cdf98adf0ae 100644 --- a/processor/metricsgenerationprocessor/go.sum +++ b/processor/metricsgenerationprocessor/go.sum @@ -64,6 +64,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c h1:ErvHovgDePqXULwMtxVQcFGIPm1KqCrz+R8XK7752wI= diff --git a/processor/metricstransformprocessor/config_test.go b/processor/metricstransformprocessor/config_test.go index 54d00d4df829..62a077b9a5f5 100644 --- a/processor/metricstransformprocessor/config_test.go +++ b/processor/metricstransformprocessor/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor/internal/metadata" ) @@ -156,7 +157,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index 785eab5eb4fb..f4602e3e76e5 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index 4dc3b4af4fd9..f8a657a635a0 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -62,6 +62,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c h1:ErvHovgDePqXULwMtxVQcFGIPm1KqCrz+R8XK7752wI= diff --git a/processor/probabilisticsamplerprocessor/config_test.go b/processor/probabilisticsamplerprocessor/config_test.go index 4bd350b6eb8e..e41934ae0832 100644 --- a/processor/probabilisticsamplerprocessor/config_test.go +++ b/processor/probabilisticsamplerprocessor/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/otelcol/otelcoltest" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor/internal/metadata" @@ -61,7 +62,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index d19c114e726e..31ac0f72827d 100644 --- a/processor/probabilisticsamplerprocessor/go.mod +++ b/processor/probabilisticsamplerprocessor/go.mod @@ -9,6 +9,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/otelcol/otelcoltest v0.119.1-0.20250210123122-44b3eeda354c @@ -70,7 +71,6 @@ require ( go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 // indirect go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/xconnector v0.119.1-0.20250210123122-44b3eeda354c // indirect diff --git a/processor/probabilisticsamplerprocessor/internal/metadata/generated_telemetry.go b/processor/probabilisticsamplerprocessor/internal/metadata/generated_telemetry.go index f96a604270e8..22657359daa7 100644 --- a/processor/probabilisticsamplerprocessor/internal/metadata/generated_telemetry.go +++ b/processor/probabilisticsamplerprocessor/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/processor/probabilisticsamplerprocessor/internal/metadata/generated_telemetry_test.go b/processor/probabilisticsamplerprocessor/internal/metadata/generated_telemetry_test.go index b8fc449d0f45..89fdfde4dfca 100644 --- a/processor/probabilisticsamplerprocessor/internal/metadata/generated_telemetry_test.go +++ b/processor/probabilisticsamplerprocessor/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/processor/probabilisticsamplerprocessor/internal/metadatatest/generated_telemetrytest_test.go b/processor/probabilisticsamplerprocessor/internal/metadatatest/generated_telemetrytest_test.go index 67e4796e6861..55b93dd0de23 100644 --- a/processor/probabilisticsamplerprocessor/internal/metadatatest/generated_telemetrytest_test.go +++ b/processor/probabilisticsamplerprocessor/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/processor/redactionprocessor/config_test.go b/processor/redactionprocessor/config_test.go index 7f7101d09eb6..9f4023fc0545 100644 --- a/processor/redactionprocessor/config_test.go +++ b/processor/redactionprocessor/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor/internal/metadata" ) @@ -50,7 +51,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/redactionprocessor/go.mod b/processor/redactionprocessor/go.mod index 2446cdc73e2f..57eedced4761 100644 --- a/processor/redactionprocessor/go.mod +++ b/processor/redactionprocessor/go.mod @@ -7,6 +7,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/processor/redactionprocessor/go.sum b/processor/redactionprocessor/go.sum index 1a0dfa66a799..667a1d7e4f4e 100644 --- a/processor/redactionprocessor/go.sum +++ b/processor/redactionprocessor/go.sum @@ -60,6 +60,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c h1:ErvHovgDePqXULwMtxVQcFGIPm1KqCrz+R8XK7752wI= diff --git a/processor/resourcedetectionprocessor/config_test.go b/processor/resourcedetectionprocessor/config_test.go index 283e0d3b14e1..d29341f35c04 100644 --- a/processor/resourcedetectionprocessor/config_test.go +++ b/processor/resourcedetectionprocessor/config_test.go @@ -14,6 +14,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/aws/ec2" @@ -150,10 +151,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.expected == nil { - assert.ErrorContains(t, component.ValidateConfig(cfg), tt.errorMessage) + assert.ErrorContains(t, xconfmap.Validate(cfg), tt.errorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.EqualExportedValues(t, *tt.expected.(*Config), *cfg.(*Config)) }) } diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index ed1043f9eb5e..15000ea70069 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -24,6 +24,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/xconsumer v0.119.1-0.20250210123122-44b3eeda354c diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index c0f8ebc73519..14f4121c8fe2 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -508,6 +508,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c h1:ErvHovgDePqXULwMtxVQcFGIPm1KqCrz+R8XK7752wI= diff --git a/processor/resourcedetectionprocessor/internal/gcp/gcp.go b/processor/resourcedetectionprocessor/internal/gcp/gcp.go index 02f612952786..a8148b759e29 100644 --- a/processor/resourcedetectionprocessor/internal/gcp/gcp.go +++ b/processor/resourcedetectionprocessor/internal/gcp/gcp.go @@ -7,6 +7,7 @@ import ( "context" "cloud.google.com/go/compute/metadata" + "github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp" "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" diff --git a/processor/resourceprocessor/config_test.go b/processor/resourceprocessor/config_test.go index cd7a1314d97f..8fbbdb8f727e 100644 --- a/processor/resourceprocessor/config_test.go +++ b/processor/resourceprocessor/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/attraction" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor/internal/metadata" @@ -54,9 +55,9 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.valid { - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) } else { - assert.Error(t, component.ValidateConfig(cfg)) + assert.Error(t, xconfmap.Validate(cfg)) } assert.Equal(t, tt.expected, cfg) }) diff --git a/processor/resourceprocessor/go.mod b/processor/resourceprocessor/go.mod index ecaf2f7808dc..05b7127c109a 100644 --- a/processor/resourceprocessor/go.mod +++ b/processor/resourceprocessor/go.mod @@ -9,6 +9,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/processor/resourceprocessor/go.sum b/processor/resourceprocessor/go.sum index 97d13f882ca6..0da59f7cca82 100644 --- a/processor/resourceprocessor/go.sum +++ b/processor/resourceprocessor/go.sum @@ -64,6 +64,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c h1:ErvHovgDePqXULwMtxVQcFGIPm1KqCrz+R8XK7752wI= diff --git a/processor/routingprocessor/config_test.go b/processor/routingprocessor/config_test.go index bda0bcd2be78..8879835af2b5 100644 --- a/processor/routingprocessor/config_test.go +++ b/processor/routingprocessor/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor/internal/metadata" @@ -130,7 +131,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -189,7 +190,7 @@ func TestValidateConfig(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - assert.EqualError(t, component.ValidateConfig(tt.config), tt.error) + assert.EqualError(t, xconfmap.Validate(tt.config), tt.error) }) } } diff --git a/processor/routingprocessor/factory_test.go b/processor/routingprocessor/factory_test.go index 6d8384767bc5..8c1afd332160 100644 --- a/processor/routingprocessor/factory_test.go +++ b/processor/routingprocessor/factory_test.go @@ -14,6 +14,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/exporter/otlpexporter" @@ -64,7 +65,7 @@ func TestProcessorGetsCreatedWithValidConfiguration(t *testing.T) { func TestFailOnEmptyConfiguration(t *testing.T) { cfg := NewFactory().CreateDefaultConfig() - assert.ErrorIs(t, component.ValidateConfig(cfg), errNoTableItems) + assert.ErrorIs(t, xconfmap.Validate(cfg), errNoTableItems) } func TestProcessorFailsToBeCreatedWhenRouteHasNoExporters(t *testing.T) { @@ -78,7 +79,7 @@ func TestProcessorFailsToBeCreatedWhenRouteHasNoExporters(t *testing.T) { }, }, } - assert.ErrorIs(t, component.ValidateConfig(cfg), errNoExporters) + assert.ErrorIs(t, xconfmap.Validate(cfg), errNoExporters) } func TestProcessorFailsToBeCreatedWhenNoRoutesExist(t *testing.T) { @@ -87,7 +88,7 @@ func TestProcessorFailsToBeCreatedWhenNoRoutesExist(t *testing.T) { FromAttribute: "X-Tenant", Table: []RoutingTableItem{}, } - assert.ErrorIs(t, component.ValidateConfig(cfg), errNoTableItems) + assert.ErrorIs(t, xconfmap.Validate(cfg), errNoTableItems) } func TestProcessorFailsWithNoFromAttribute(t *testing.T) { @@ -100,7 +101,7 @@ func TestProcessorFailsWithNoFromAttribute(t *testing.T) { }, }, } - assert.ErrorIs(t, component.ValidateConfig(cfg), errNoMissingFromAttribute) + assert.ErrorIs(t, xconfmap.Validate(cfg), errNoMissingFromAttribute) } func TestShouldNotFailWhenNextIsProcessor(t *testing.T) { diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index 5d022cf1e1a8..66bac0f406de 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configgrpc v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/processor/routingprocessor/internal/metadata/generated_telemetry.go b/processor/routingprocessor/internal/metadata/generated_telemetry.go index 11772f4db6a3..b2b94e0d0f93 100644 --- a/processor/routingprocessor/internal/metadata/generated_telemetry.go +++ b/processor/routingprocessor/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/processor/routingprocessor/internal/metadata/generated_telemetry_test.go b/processor/routingprocessor/internal/metadata/generated_telemetry_test.go index 0727bbc7109e..8f2f539900a3 100644 --- a/processor/routingprocessor/internal/metadata/generated_telemetry_test.go +++ b/processor/routingprocessor/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/processor/routingprocessor/internal/metadatatest/generated_telemetrytest_test.go b/processor/routingprocessor/internal/metadatatest/generated_telemetrytest_test.go index 97659544eeac..7273320b5a82 100644 --- a/processor/routingprocessor/internal/metadatatest/generated_telemetrytest_test.go +++ b/processor/routingprocessor/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/processor/schemaprocessor/config_test.go b/processor/schemaprocessor/config_test.go index 4cd33a31a1a4..22f2aa12f94a 100644 --- a/processor/schemaprocessor/config_test.go +++ b/processor/schemaprocessor/config_test.go @@ -12,6 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/schemaprocessor/internal/metadata" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/schemaprocessor/internal/translation" @@ -83,6 +84,6 @@ func TestConfigurationValidation(t *testing.T) { Targets: tc.target, } - assert.ErrorIs(t, component.ValidateConfig(cfg), tc.expectError, tc.scenario) + assert.ErrorIs(t, xconfmap.Validate(cfg), tc.expectError, tc.scenario) } } diff --git a/processor/schemaprocessor/go.mod b/processor/schemaprocessor/go.mod index d1b6c08ea436..e1559005ef84 100644 --- a/processor/schemaprocessor/go.mod +++ b/processor/schemaprocessor/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/processor/schemaprocessor/go.sum b/processor/schemaprocessor/go.sum index 1a8be6ae7668..a8a24429b421 100644 --- a/processor/schemaprocessor/go.sum +++ b/processor/schemaprocessor/go.sum @@ -88,6 +88,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c h1:ErvHovgDePqXULwMtxVQcFGIPm1KqCrz+R8XK7752wI= diff --git a/processor/spanprocessor/config_test.go b/processor/spanprocessor/config_test.go index b4f3aa0e1d24..cd5e5809d71a 100644 --- a/processor/spanprocessor/config_test.go +++ b/processor/spanprocessor/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterconfig" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterset" @@ -122,7 +123,7 @@ func TestLoadingConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/processor/spanprocessor/go.mod b/processor/spanprocessor/go.mod index 592c71fe65cc..01af8285b090 100644 --- a/processor/spanprocessor/go.mod +++ b/processor/spanprocessor/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/processor/spanprocessor/go.sum b/processor/spanprocessor/go.sum index def80bf117fe..275a65b16c41 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -97,6 +97,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c h1:ErvHovgDePqXULwMtxVQcFGIPm1KqCrz+R8XK7752wI= diff --git a/processor/tailsamplingprocessor/internal/metadata/generated_telemetry.go b/processor/tailsamplingprocessor/internal/metadata/generated_telemetry.go index ad332518b2fa..68494f57c5a4 100644 --- a/processor/tailsamplingprocessor/internal/metadata/generated_telemetry.go +++ b/processor/tailsamplingprocessor/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/processor/tailsamplingprocessor/internal/metadata/generated_telemetry_test.go b/processor/tailsamplingprocessor/internal/metadata/generated_telemetry_test.go index 919da43ebd7f..00a7a44ed926 100644 --- a/processor/tailsamplingprocessor/internal/metadata/generated_telemetry_test.go +++ b/processor/tailsamplingprocessor/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/processor/tailsamplingprocessor/internal/metadatatest/generated_telemetrytest_test.go b/processor/tailsamplingprocessor/internal/metadatatest/generated_telemetrytest_test.go index 3744e49df9b2..8b2db1d22718 100644 --- a/processor/tailsamplingprocessor/internal/metadatatest/generated_telemetrytest_test.go +++ b/processor/tailsamplingprocessor/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/processor/transformprocessor/config_test.go b/processor/transformprocessor/config_test.go index 76655818fe3e..9f20f548a4ec 100644 --- a/processor/transformprocessor/config_test.go +++ b/processor/transformprocessor/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor/internal/common" @@ -357,7 +358,7 @@ func TestLoadConfig(t *testing.T) { assert.NoError(t, sub.Unmarshal(cfg)) if tt.expected == nil { - err = component.ValidateConfig(cfg) + err = xconfmap.Validate(cfg) assert.Error(t, err) if len(tt.errors) > 0 { @@ -366,7 +367,7 @@ func TestLoadConfig(t *testing.T) { } } } else { - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) } }) diff --git a/processor/transformprocessor/factory_test.go b/processor/transformprocessor/factory_test.go index 076830176121..41bb02e9e1de 100644 --- a/processor/transformprocessor/factory_test.go +++ b/processor/transformprocessor/factory_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" @@ -41,7 +41,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { func TestFactoryCreateProcessor_Empty(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) assert.NoError(t, err) } diff --git a/processor/transformprocessor/go.mod b/processor/transformprocessor/go.mod index 82b1d2838206..96f43c72cf77 100644 --- a/processor/transformprocessor/go.mod +++ b/processor/transformprocessor/go.mod @@ -26,6 +26,7 @@ require ( require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/processor/processortest v0.119.1-0.20250210123122-44b3eeda354c golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 diff --git a/processor/transformprocessor/go.sum b/processor/transformprocessor/go.sum index def80bf117fe..275a65b16c41 100644 --- a/processor/transformprocessor/go.sum +++ b/processor/transformprocessor/go.sum @@ -97,6 +97,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c h1:ErvHovgDePqXULwMtxVQcFGIPm1KqCrz+R8XK7752wI= diff --git a/receiver/activedirectorydsreceiver/config_test.go b/receiver/activedirectorydsreceiver/config_test.go index 8915cbd19764..8aabbde38c59 100644 --- a/receiver/activedirectorydsreceiver/config_test.go +++ b/receiver/activedirectorydsreceiver/config_test.go @@ -14,6 +14,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver/internal/metadata" @@ -56,7 +57,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(metadata.MetricsBuilderConfig{}), cmpopts.IgnoreUnexported(metadata.MetricConfig{})); diff != "" { t.Errorf("Config mismatch (-expected +actual):\n%s", diff) } diff --git a/receiver/activedirectorydsreceiver/go.mod b/receiver/activedirectorydsreceiver/go.mod index 935c14eae982..ef7a8c846b9a 100644 --- a/receiver/activedirectorydsreceiver/go.mod +++ b/receiver/activedirectorydsreceiver/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/activedirectorydsreceiver/go.sum b/receiver/activedirectorydsreceiver/go.sum index c2602184f984..2156f0a46053 100644 --- a/receiver/activedirectorydsreceiver/go.sum +++ b/receiver/activedirectorydsreceiver/go.sum @@ -60,6 +60,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/apachereceiver/config_test.go b/receiver/apachereceiver/config_test.go index 4df11f66fb3b..4e981e3822fe 100644 --- a/receiver/apachereceiver/config_test.go +++ b/receiver/apachereceiver/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver/internal/metadata" ) @@ -71,7 +72,7 @@ func TestValidate(t *testing.T) { t.Run(tc.desc, func(t *testing.T) { cfg := NewFactory().CreateDefaultConfig().(*Config) cfg.Endpoint = tc.endpoint - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) if tc.errExpected { require.EqualError(t, err, tc.errText) return diff --git a/receiver/apachereceiver/factory_test.go b/receiver/apachereceiver/factory_test.go index f95251910831..e30cf51dae79 100644 --- a/receiver/apachereceiver/factory_test.go +++ b/receiver/apachereceiver/factory_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/scraper/scraperhelper" @@ -25,7 +25,7 @@ func TestType(t *testing.T) { func TestValidConfig(t *testing.T) { factory := NewFactory() - require.NoError(t, component.ValidateConfig(factory.CreateDefaultConfig())) + require.NoError(t, xconfmap.Validate(factory.CreateDefaultConfig())) } func TestCreateMetrics(t *testing.T) { diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index 618c72c49dad..a3e50c269ffa 100644 --- a/receiver/apachereceiver/go.mod +++ b/receiver/apachereceiver/go.mod @@ -14,6 +14,7 @@ require ( go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/filter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/apachereceiver/go.sum b/receiver/apachereceiver/go.sum index ce02c6c1278b..61179d00a98f 100644 --- a/receiver/apachereceiver/go.sum +++ b/receiver/apachereceiver/go.sum @@ -160,6 +160,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/apachereceiver/scraper_test.go b/receiver/apachereceiver/scraper_test.go index cf332a609103..7056c215d1e6 100644 --- a/receiver/apachereceiver/scraper_test.go +++ b/receiver/apachereceiver/scraper_test.go @@ -15,10 +15,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" @@ -32,7 +32,7 @@ func TestScraper(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Endpoint = fmt.Sprintf("%s%s", apacheMock.URL, "/server-status?auto") - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) serverName, port, err := parseResourceAttributes(cfg.Endpoint) require.NoError(t, err) diff --git a/receiver/awscloudwatchreceiver/config_test.go b/receiver/awscloudwatchreceiver/config_test.go index d5570575cd5f..9898f4739565 100644 --- a/receiver/awscloudwatchreceiver/config_test.go +++ b/receiver/awscloudwatchreceiver/config_test.go @@ -13,6 +13,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscloudwatchreceiver/internal/metadata" ) @@ -262,7 +263,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, loaded.Unmarshal(cfg)) require.Equal(t, tc.expectedConfig, cfg) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) }) } } diff --git a/receiver/awscloudwatchreceiver/go.mod b/receiver/awscloudwatchreceiver/go.mod index 9310b560f6c9..115274b4ea21 100644 --- a/receiver/awscloudwatchreceiver/go.mod +++ b/receiver/awscloudwatchreceiver/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/awscloudwatchreceiver/go.sum b/receiver/awscloudwatchreceiver/go.sum index 89fd8f5a7037..29bb01ee50ae 100644 --- a/receiver/awscloudwatchreceiver/go.sum +++ b/receiver/awscloudwatchreceiver/go.sum @@ -68,6 +68,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/awscontainerinsightreceiver/config_test.go b/receiver/awscontainerinsightreceiver/config_test.go index d65f21921b6a..26cc50b5ac89 100644 --- a/receiver/awscontainerinsightreceiver/config_test.go +++ b/receiver/awscontainerinsightreceiver/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver/internal/metadata" ) @@ -50,7 +51,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index 311efd79455a..8e750b9d968e 100644 --- a/receiver/awscontainerinsightreceiver/go.mod +++ b/receiver/awscontainerinsightreceiver/go.mod @@ -17,6 +17,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index a6e78cf7e7ad..086d90a42322 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -386,6 +386,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/awsecscontainermetricsreceiver/config_test.go b/receiver/awsecscontainermetricsreceiver/config_test.go index ea6a09c8f662..741183fbbea9 100644 --- a/receiver/awsecscontainermetricsreceiver/config_test.go +++ b/receiver/awsecscontainermetricsreceiver/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver/internal/metadata" ) @@ -47,7 +48,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index d4a5b8486d81..3894bf09056e 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index 679e639c9ced..33940b732da2 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -86,6 +86,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/awsfirehosereceiver/config_test.go b/receiver/awsfirehosereceiver/config_test.go index 5d9429ddc62b..eb9add020831 100644 --- a/receiver/awsfirehosereceiver/config_test.go +++ b/receiver/awsfirehosereceiver/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfirehosereceiver/internal/metadata" ) @@ -33,7 +34,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - err = component.ValidateConfig(cfg) + err = xconfmap.Validate(cfg) if configType == "invalid" { assert.Error(t, err) } else { diff --git a/receiver/awsfirehosereceiver/go.mod b/receiver/awsfirehosereceiver/go.mod index 90faf927681a..6fcf91d89191 100644 --- a/receiver/awsfirehosereceiver/go.mod +++ b/receiver/awsfirehosereceiver/go.mod @@ -15,6 +15,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/awsfirehosereceiver/go.sum b/receiver/awsfirehosereceiver/go.sum index c513a4c5272a..e6cf6159c0f7 100644 --- a/receiver/awsfirehosereceiver/go.sum +++ b/receiver/awsfirehosereceiver/go.sum @@ -86,6 +86,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/awss3receiver/config_test.go b/receiver/awss3receiver/config_test.go index 5c0883968213..ea34800b77e7 100644 --- a/receiver/awss3receiver/config_test.go +++ b/receiver/awss3receiver/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awss3receiver/internal/metadata" ) @@ -119,11 +120,11 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.errorMessage != "" { - assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) + assert.EqualError(t, xconfmap.Validate(cfg), tt.errorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/awss3receiver/go.mod b/receiver/awss3receiver/go.mod index 413dd379e01d..920d6a12946f 100644 --- a/receiver/awss3receiver/go.mod +++ b/receiver/awss3receiver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/awss3receiver/go.sum b/receiver/awss3receiver/go.sum index 79003e41c630..c85b9b7ee8ee 100644 --- a/receiver/awss3receiver/go.sum +++ b/receiver/awss3receiver/go.sum @@ -100,6 +100,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/awsxrayreceiver/config_test.go b/receiver/awsxrayreceiver/config_test.go index b343a04c841c..f7dd1a5a374f 100644 --- a/receiver/awsxrayreceiver/config_test.go +++ b/receiver/awsxrayreceiver/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver/internal/metadata" @@ -90,7 +91,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index 4fc5a93c94b1..e2d3b8c79911 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -17,6 +17,7 @@ require ( go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index abd0adb93d73..4c04702b73fe 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -78,6 +78,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/azureblobreceiver/config_test.go b/receiver/azureblobreceiver/config_test.go index 1662c5e0deaa..067f6ce48d44 100644 --- a/receiver/azureblobreceiver/config_test.go +++ b/receiver/azureblobreceiver/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/otelcol/otelcoltest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureblobreceiver/internal/metadata" @@ -64,7 +65,7 @@ func TestLoadConfig(t *testing.T) { func TestMissingConnectionString(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) assert.EqualError(t, err, `"ConnectionString" is not specified in config`) } @@ -73,6 +74,6 @@ func TestMissingServicePrincipalCredentials(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() cfg.(*Config).Authentication = ServicePrincipalAuth - err = component.ValidateConfig(cfg) + err = xconfmap.Validate(cfg) assert.EqualError(t, err, `"TenantID" is not specified in config; "ClientID" is not specified in config; "ClientSecret" is not specified in config; "StorageAccountURL" is not specified in config`) } diff --git a/receiver/azureblobreceiver/go.mod b/receiver/azureblobreceiver/go.mod index d050d157c792..c0c40ba0da2b 100644 --- a/receiver/azureblobreceiver/go.mod +++ b/receiver/azureblobreceiver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/otelcol/otelcoltest v0.119.1-0.20250210123122-44b3eeda354c @@ -92,7 +93,6 @@ require ( go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 // indirect go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/xconnector v0.119.1-0.20250210123122-44b3eeda354c // indirect diff --git a/receiver/azureeventhubreceiver/config_test.go b/receiver/azureeventhubreceiver/config_test.go index 7c570df0dda3..ab72898c92bd 100644 --- a/receiver/azureeventhubreceiver/config_test.go +++ b/receiver/azureeventhubreceiver/config_test.go @@ -10,6 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/otelcol/otelcoltest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver/internal/metadata" @@ -46,7 +47,7 @@ func TestLoadConfig(t *testing.T) { func TestMissingConnection(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) assert.EqualError(t, err, "missing connection") } @@ -54,7 +55,7 @@ func TestInvalidConnectionString(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() cfg.(*Config).Connection = "foo" - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) assert.EqualError(t, err, "failed parsing connection string due to unmatched key value separated by '='") } @@ -70,6 +71,6 @@ func TestInvalidFormat(t *testing.T) { cfg := factory.CreateDefaultConfig() cfg.(*Config).Connection = "Endpoint=sb://namespace.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=superSecret1234=;EntityPath=hubName" cfg.(*Config).Format = "invalid" - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) assert.ErrorContains(t, err, "invalid format; must be one of") } diff --git a/receiver/azureeventhubreceiver/go.mod b/receiver/azureeventhubreceiver/go.mod index c6098c00dc0a..8fcef19a4b4d 100644 --- a/receiver/azureeventhubreceiver/go.mod +++ b/receiver/azureeventhubreceiver/go.mod @@ -15,6 +15,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/xextension v0.119.1-0.20250210123122-44b3eeda354c @@ -95,7 +96,6 @@ require ( go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 // indirect go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/xconnector v0.119.1-0.20250210123122-44b3eeda354c // indirect diff --git a/receiver/carbonreceiver/config_test.go b/receiver/carbonreceiver/config_test.go index f7a01681505d..955b06a8d0d5 100644 --- a/receiver/carbonreceiver/config_test.go +++ b/receiver/carbonreceiver/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/internal/metadata" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/protocol" @@ -87,7 +88,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index b747114f7090..40862a343cf0 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index eb1adbe2cce3..5e8c80f394c6 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -64,6 +64,8 @@ go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:ZppUH1hgUJOubawEsxsQ9MzEYFytqo2GnVSS7d4CVxc= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/cloudflarereceiver/config_test.go b/receiver/cloudflarereceiver/config_test.go index 6053013a5ba4..82f36e2d48dd 100644 --- a/receiver/cloudflarereceiver/config_test.go +++ b/receiver/cloudflarereceiver/config_test.go @@ -11,6 +11,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudflarereceiver/internal/metadata" ) @@ -140,7 +141,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, loaded.Unmarshal(cfg)) require.Equal(t, tc.expectedConfig, cfg) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) }) } } diff --git a/receiver/cloudflarereceiver/go.mod b/receiver/cloudflarereceiver/go.mod index 43c460bcd8b5..7fe93fff61c9 100644 --- a/receiver/cloudflarereceiver/go.mod +++ b/receiver/cloudflarereceiver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/cloudflarereceiver/go.sum b/receiver/cloudflarereceiver/go.sum index fcf5fc73e812..5fcc12b1320f 100644 --- a/receiver/cloudflarereceiver/go.sum +++ b/receiver/cloudflarereceiver/go.sum @@ -70,6 +70,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/cloudfoundryreceiver/config_test.go b/receiver/cloudfoundryreceiver/config_test.go index b5d34765bc9d..a719804d7c97 100644 --- a/receiver/cloudfoundryreceiver/config_test.go +++ b/receiver/cloudfoundryreceiver/config_test.go @@ -16,6 +16,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudfoundryreceiver/internal/metadata" ) @@ -95,10 +96,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.expected == nil { - assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) + assert.EqualError(t, xconfmap.Validate(cfg), tt.errorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/cloudfoundryreceiver/converter.go b/receiver/cloudfoundryreceiver/converter.go index 166651ef75d8..d5af4af73f7f 100644 --- a/receiver/cloudfoundryreceiver/converter.go +++ b/receiver/cloudfoundryreceiver/converter.go @@ -9,6 +9,7 @@ import ( "time" "code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2" + "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" diff --git a/receiver/cloudfoundryreceiver/go.mod b/receiver/cloudfoundryreceiver/go.mod index e8439ae026c6..f8e5254b7172 100644 --- a/receiver/cloudfoundryreceiver/go.mod +++ b/receiver/cloudfoundryreceiver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/featuregate v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/cloudfoundryreceiver/go.sum b/receiver/cloudfoundryreceiver/go.sum index f613022d56f6..49a4b4238818 100644 --- a/receiver/cloudfoundryreceiver/go.sum +++ b/receiver/cloudfoundryreceiver/go.sum @@ -127,6 +127,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/cloudfoundryreceiver/receiver.go b/receiver/cloudfoundryreceiver/receiver.go index c5d3deb06d3b..13443cd8b56d 100644 --- a/receiver/cloudfoundryreceiver/receiver.go +++ b/receiver/cloudfoundryreceiver/receiver.go @@ -13,6 +13,7 @@ import ( "code.cloudfoundry.org/go-loggregator" "code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componentstatus" "go.opentelemetry.io/collector/consumer" diff --git a/receiver/cloudfoundryreceiver/receiver_test.go b/receiver/cloudfoundryreceiver/receiver_test.go index b5ce98a5191b..a1da214b6a4e 100644 --- a/receiver/cloudfoundryreceiver/receiver_test.go +++ b/receiver/cloudfoundryreceiver/receiver_test.go @@ -9,6 +9,7 @@ import ( "time" "code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2" + "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" diff --git a/receiver/cloudfoundryreceiver/stream.go b/receiver/cloudfoundryreceiver/stream.go index c0b2e7b088ff..78b551aefa8b 100644 --- a/receiver/cloudfoundryreceiver/stream.go +++ b/receiver/cloudfoundryreceiver/stream.go @@ -11,6 +11,7 @@ import ( "code.cloudfoundry.org/go-loggregator" "code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.uber.org/zap" diff --git a/receiver/collectdreceiver/config_test.go b/receiver/collectdreceiver/config_test.go index 1da15f7ef077..a332a33baaa2 100644 --- a/receiver/collectdreceiver/config_test.go +++ b/receiver/collectdreceiver/config_test.go @@ -14,6 +14,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver/internal/metadata" ) @@ -57,9 +58,9 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.wantErr == nil { - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) } else { - assert.ErrorContains(t, component.ValidateConfig(cfg), tt.wantErr.Error()) + assert.ErrorContains(t, xconfmap.Validate(cfg), tt.wantErr.Error()) } assert.Equal(t, tt.expected, cfg) }) diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index c4211e22dcec..74fb86b9f417 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index 0d34534743e3..527e8fab648c 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -86,6 +86,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/couchdbreceiver/factory_test.go b/receiver/couchdbreceiver/factory_test.go index 68c611271bb5..705aefb4ff41 100644 --- a/receiver/couchdbreceiver/factory_test.go +++ b/receiver/couchdbreceiver/factory_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" @@ -28,7 +28,7 @@ func TestValidConfig(t *testing.T) { cfg.Password = "otel" require.EqualValues(t, defaultEndpoint, cfg.Endpoint) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) } func TestCreateMetrics(t *testing.T) { diff --git a/receiver/couchdbreceiver/go.mod b/receiver/couchdbreceiver/go.mod index aa81b38076d2..90151dac1303 100644 --- a/receiver/couchdbreceiver/go.mod +++ b/receiver/couchdbreceiver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/filter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/couchdbreceiver/go.sum b/receiver/couchdbreceiver/go.sum index 29beda7a8c82..3e87af915122 100644 --- a/receiver/couchdbreceiver/go.sum +++ b/receiver/couchdbreceiver/go.sum @@ -86,6 +86,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/couchdbreceiver/scraper_test.go b/receiver/couchdbreceiver/scraper_test.go index 5a12dde763a6..f9340a42809d 100644 --- a/receiver/couchdbreceiver/scraper_test.go +++ b/receiver/couchdbreceiver/scraper_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/scraper/scrapererror" "go.uber.org/zap" @@ -34,7 +34,7 @@ func TestScrape(t *testing.T) { cfg := f.CreateDefaultConfig().(*Config) cfg.Username = "otelu" cfg.Password = "otelp" - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) t.Run("scrape from couchdb version 2.31", func(t *testing.T) { mockClient := new(mockClient) @@ -123,7 +123,7 @@ func TestStart(t *testing.T) { cfg := f.CreateDefaultConfig().(*Config) cfg.Username = "otelu" cfg.Password = "otelp" - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) scraper := newCouchdbScraper(receivertest.NewNopSettings(), cfg) err := scraper.start(context.Background(), componenttest.NewNopHost()) @@ -135,7 +135,7 @@ func TestStart(t *testing.T) { cfg.ClientConfig.TLSSetting.CAFile = "/non/existent" cfg.Username = "otelu" cfg.Password = "otelp" - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) scraper := newCouchdbScraper(receivertest.NewNopSettings(), cfg) err := scraper.start(context.Background(), componenttest.NewNopHost()) diff --git a/receiver/dockerstatsreceiver/config_test.go b/receiver/dockerstatsreceiver/config_test.go index c45aa2c260b9..dc265953aa44 100644 --- a/receiver/dockerstatsreceiver/config_test.go +++ b/receiver/dockerstatsreceiver/config_test.go @@ -15,6 +15,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker" @@ -89,7 +90,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(metadata.MetricConfig{}), cmpopts.IgnoreUnexported(metadata.ResourceAttributeConfig{})); diff != "" { t.Errorf("Config mismatch (-expected +actual):\n%s", diff) } @@ -101,7 +102,7 @@ func TestValidateErrors(t *testing.T) { cfg := &Config{ControllerConfig: scraperhelper.NewDefaultControllerConfig(), Config: docker.Config{ DockerAPIVersion: "1.25", }} - assert.ErrorContains(t, component.ValidateConfig(cfg), "endpoint must be specified") + assert.ErrorContains(t, xconfmap.Validate(cfg), "endpoint must be specified") cfg = &Config{ Config: docker.Config{ @@ -110,7 +111,7 @@ func TestValidateErrors(t *testing.T) { }, ControllerConfig: scraperhelper.ControllerConfig{CollectionInterval: 1 * time.Second}, } - assert.ErrorContains(t, component.ValidateConfig(cfg), `"api_version" 1.21 must be at least 1.25`) + assert.ErrorContains(t, xconfmap.Validate(cfg), `"api_version" 1.21 must be at least 1.25`) cfg = &Config{ Config: docker.Config{ @@ -119,7 +120,7 @@ func TestValidateErrors(t *testing.T) { }, ControllerConfig: scraperhelper.ControllerConfig{}, } - assert.ErrorContains(t, component.ValidateConfig(cfg), `"collection_interval": requires positive value`) + assert.ErrorContains(t, xconfmap.Validate(cfg), `"collection_interval": requires positive value`) } func TestApiVersionCustomError(t *testing.T) { diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index 88808c8f1d4b..7215b70e0623 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -14,6 +14,7 @@ require ( go.opentelemetry.io/collector/component/componentstatus v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/filter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index d1fde1b30d94..1ab082d0b7af 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -144,6 +144,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/elasticsearchreceiver/config_test.go b/receiver/elasticsearchreceiver/config_test.go index 8dfae0473858..72c9ac9d1872 100644 --- a/receiver/elasticsearchreceiver/config_test.go +++ b/receiver/elasticsearchreceiver/config_test.go @@ -16,6 +16,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver/internal/metadata" @@ -33,7 +34,7 @@ func TestValidateCredentials(t *testing.T) { cfg := NewFactory().CreateDefaultConfig().(*Config) cfg.Username = "user" - require.ErrorIs(t, component.ValidateConfig(cfg), errPasswordNotSpecified) + require.ErrorIs(t, xconfmap.Validate(cfg), errPasswordNotSpecified) }, }, { @@ -43,7 +44,7 @@ func TestValidateCredentials(t *testing.T) { cfg := NewFactory().CreateDefaultConfig().(*Config) cfg.Password = "pass" - require.ErrorIs(t, component.ValidateConfig(cfg), errUsernameNotSpecified) + require.ErrorIs(t, xconfmap.Validate(cfg), errUsernameNotSpecified) }, }, { @@ -54,7 +55,7 @@ func TestValidateCredentials(t *testing.T) { cfg := NewFactory().CreateDefaultConfig().(*Config) cfg.Username = "user" cfg.Password = "pass" - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) }, }, { @@ -63,7 +64,7 @@ func TestValidateCredentials(t *testing.T) { t.Parallel() cfg := NewFactory().CreateDefaultConfig().(*Config) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) }, }, } @@ -124,7 +125,7 @@ func TestValidateEndpoint(t *testing.T) { cfg := NewFactory().CreateDefaultConfig().(*Config) cfg.Endpoint = testCase.rawURL - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) switch { case testCase.expectedErr != nil: @@ -187,7 +188,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(metadata.MetricConfig{}), 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 0e4195259824..d4afc20221fe 100644 --- a/receiver/elasticsearchreceiver/go.mod +++ b/receiver/elasticsearchreceiver/go.mod @@ -16,6 +16,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/filter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/elasticsearchreceiver/go.sum b/receiver/elasticsearchreceiver/go.sum index a31872f8ba2a..292342d8a2b7 100644 --- a/receiver/elasticsearchreceiver/go.sum +++ b/receiver/elasticsearchreceiver/go.sum @@ -162,6 +162,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/envoyalsreceiver/config_test.go b/receiver/envoyalsreceiver/config_test.go index c14d9d145d7e..8207b76e48e2 100644 --- a/receiver/envoyalsreceiver/config_test.go +++ b/receiver/envoyalsreceiver/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/envoyalsreceiver/internal/metadata" ) @@ -60,7 +61,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/envoyalsreceiver/go.mod b/receiver/envoyalsreceiver/go.mod index d67b05409328..7fb6439081fd 100644 --- a/receiver/envoyalsreceiver/go.mod +++ b/receiver/envoyalsreceiver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/config/configgrpc v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/envoyalsreceiver/go.sum b/receiver/envoyalsreceiver/go.sum index 9bcf9dad179b..88005c896de7 100644 --- a/receiver/envoyalsreceiver/go.sum +++ b/receiver/envoyalsreceiver/go.sum @@ -94,6 +94,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/expvarreceiver/config_test.go b/receiver/expvarreceiver/config_test.go index d87be1f63ec8..3d14b69afa49 100644 --- a/receiver/expvarreceiver/config_test.go +++ b/receiver/expvarreceiver/config_test.go @@ -15,6 +15,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver/internal/metadata" @@ -78,10 +79,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.expected == nil { - assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) + assert.EqualError(t, xconfmap.Validate(cfg), tt.errorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(metadata.MetricConfig{})); diff != "" { t.Errorf("Config mismatch (-expected +actual):\n%s", diff) } diff --git a/receiver/expvarreceiver/go.mod b/receiver/expvarreceiver/go.mod index 24612845a500..65f465e3eb98 100644 --- a/receiver/expvarreceiver/go.mod +++ b/receiver/expvarreceiver/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/expvarreceiver/go.sum b/receiver/expvarreceiver/go.sum index 39c52cd7d1eb..1b1da731a053 100644 --- a/receiver/expvarreceiver/go.sum +++ b/receiver/expvarreceiver/go.sum @@ -84,6 +84,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/filelogreceiver/filelog_test.go b/receiver/filelogreceiver/filelog_test.go index 0aaf2486b143..976e6d8d8214 100644 --- a/receiver/filelogreceiver/filelog_test.go +++ b/receiver/filelogreceiver/filelog_test.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pipeline" @@ -55,7 +56,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, testdataConfigYaml(), cfg) } diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index b6d58d3cff37..ba29eea89d56 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -21,6 +21,7 @@ require ( require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.119.0 go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pipeline v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/receiver/receivertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index 40498e082db2..cc064908c2ae 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -85,6 +85,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/fluentforwardreceiver/config_test.go b/receiver/fluentforwardreceiver/config_test.go index 613b80445ac3..a1a34ac3ea45 100644 --- a/receiver/fluentforwardreceiver/config_test.go +++ b/receiver/fluentforwardreceiver/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" ) func TestLoadConfig(t *testing.T) { @@ -24,6 +25,6 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, factory.CreateDefaultConfig(), cfg) } diff --git a/receiver/fluentforwardreceiver/go.mod b/receiver/fluentforwardreceiver/go.mod index 113d44819fc5..4124b68f215f 100644 --- a/receiver/fluentforwardreceiver/go.mod +++ b/receiver/fluentforwardreceiver/go.mod @@ -9,6 +9,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/fluentforwardreceiver/go.sum b/receiver/fluentforwardreceiver/go.sum index aa353f82051a..c829c5e138f8 100644 --- a/receiver/fluentforwardreceiver/go.sum +++ b/receiver/fluentforwardreceiver/go.sum @@ -64,6 +64,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/fluentforwardreceiver/internal/metadata/generated_telemetry.go b/receiver/fluentforwardreceiver/internal/metadata/generated_telemetry.go index 602a1531ea2c..ab97d5e86771 100644 --- a/receiver/fluentforwardreceiver/internal/metadata/generated_telemetry.go +++ b/receiver/fluentforwardreceiver/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/receiver/fluentforwardreceiver/internal/metadata/generated_telemetry_test.go b/receiver/fluentforwardreceiver/internal/metadata/generated_telemetry_test.go index 12f1c7dda902..fa2319a6c9bd 100644 --- a/receiver/fluentforwardreceiver/internal/metadata/generated_telemetry_test.go +++ b/receiver/fluentforwardreceiver/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/receiver/fluentforwardreceiver/internal/metadatatest/generated_telemetrytest_test.go b/receiver/fluentforwardreceiver/internal/metadatatest/generated_telemetrytest_test.go index eca94b6a2982..ae4d49652549 100644 --- a/receiver/fluentforwardreceiver/internal/metadatatest/generated_telemetrytest_test.go +++ b/receiver/fluentforwardreceiver/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/receiver/googlecloudmonitoringreceiver/receiver.go b/receiver/googlecloudmonitoringreceiver/receiver.go index eb5cedea91b6..f6091c80a6f4 100644 --- a/receiver/googlecloudmonitoringreceiver/receiver.go +++ b/receiver/googlecloudmonitoringreceiver/receiver.go @@ -12,6 +12,7 @@ import ( monitoring "cloud.google.com/go/monitoring/apiv3/v2" "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap" diff --git a/receiver/googlecloudpubsubreceiver/config_test.go b/receiver/googlecloudpubsubreceiver/config_test.go index 6b86acc14bb4..ee56bd7f8123 100644 --- a/receiver/googlecloudpubsubreceiver/config_test.go +++ b/receiver/googlecloudpubsubreceiver/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver/internal/metadata" @@ -54,7 +55,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index 04e9240f19d8..f31ad619b13c 100644 --- a/receiver/googlecloudpubsubreceiver/go.mod +++ b/receiver/googlecloudpubsubreceiver/go.mod @@ -14,6 +14,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/googlecloudpubsubreceiver/go.sum b/receiver/googlecloudpubsubreceiver/go.sum index a61f3ef4041c..3dff3a028ecc 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -132,6 +132,8 @@ go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3ee go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:cleBc9I0DIWpTiiHfu9v83FUaCTqcPXmebpLxjEIqro= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/googlecloudpubsubreceiver/internal/handler.go b/receiver/googlecloudpubsubreceiver/internal/handler.go index 17b126860b0d..624fb35dd529 100644 --- a/receiver/googlecloudpubsubreceiver/internal/handler.go +++ b/receiver/googlecloudpubsubreceiver/internal/handler.go @@ -13,6 +13,7 @@ import ( "time" "cloud.google.com/go/pubsub/apiv1/pubsubpb" + "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" diff --git a/receiver/googlecloudpubsubreceiver/internal/handler_test.go b/receiver/googlecloudpubsubreceiver/internal/handler_test.go index bf860038ff1c..a00474b02e6d 100644 --- a/receiver/googlecloudpubsubreceiver/internal/handler_test.go +++ b/receiver/googlecloudpubsubreceiver/internal/handler_test.go @@ -11,6 +11,7 @@ import ( pubsub "cloud.google.com/go/pubsub/apiv1" "cloud.google.com/go/pubsub/apiv1/pubsubpb" "cloud.google.com/go/pubsub/pstest" + "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/receiver/receivertest" "google.golang.org/api/option" diff --git a/receiver/googlecloudpubsubreceiver/internal/log_entry.go b/receiver/googlecloudpubsubreceiver/internal/log_entry.go index 8ebc3f2fd9a3..187b882f0fbc 100644 --- a/receiver/googlecloudpubsubreceiver/internal/log_entry.go +++ b/receiver/googlecloudpubsubreceiver/internal/log_entry.go @@ -15,6 +15,7 @@ import ( "time" "cloud.google.com/go/logging/apiv2/loggingpb" + "github.com/iancoleman/strcase" jsoniter "github.com/json-iterator/go" "go.opentelemetry.io/collector/pdata/pcommon" diff --git a/receiver/googlecloudpubsubreceiver/internal/metadata/generated_telemetry.go b/receiver/googlecloudpubsubreceiver/internal/metadata/generated_telemetry.go index 1f1ffdc1ba8c..7d3bc5febcf4 100644 --- a/receiver/googlecloudpubsubreceiver/internal/metadata/generated_telemetry.go +++ b/receiver/googlecloudpubsubreceiver/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/receiver/googlecloudpubsubreceiver/internal/metadata/generated_telemetry_test.go b/receiver/googlecloudpubsubreceiver/internal/metadata/generated_telemetry_test.go index 8e1906aa90f4..96e8e1c90dda 100644 --- a/receiver/googlecloudpubsubreceiver/internal/metadata/generated_telemetry_test.go +++ b/receiver/googlecloudpubsubreceiver/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/receiver/googlecloudpubsubreceiver/internal/metadatatest/generated_telemetrytest_test.go b/receiver/googlecloudpubsubreceiver/internal/metadatatest/generated_telemetrytest_test.go index 093a4b253d8b..9e5a8add8259 100644 --- a/receiver/googlecloudpubsubreceiver/internal/metadatatest/generated_telemetrytest_test.go +++ b/receiver/googlecloudpubsubreceiver/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/receiver/googlecloudpubsubreceiver/internal/subscriber_client.go b/receiver/googlecloudpubsubreceiver/internal/subscriber_client.go index 40afac56de6c..7ce6557fd3f8 100644 --- a/receiver/googlecloudpubsubreceiver/internal/subscriber_client.go +++ b/receiver/googlecloudpubsubreceiver/internal/subscriber_client.go @@ -7,6 +7,7 @@ import ( "context" "cloud.google.com/go/pubsub/apiv1/pubsubpb" + "github.com/googleapis/gax-go/v2" ) diff --git a/receiver/googlecloudpubsubreceiver/receiver.go b/receiver/googlecloudpubsubreceiver/receiver.go index 4c444f2d8f97..e35c53e85df5 100644 --- a/receiver/googlecloudpubsubreceiver/receiver.go +++ b/receiver/googlecloudpubsubreceiver/receiver.go @@ -15,6 +15,7 @@ import ( "time" "cloud.google.com/go/pubsub/apiv1/pubsubpb" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pcommon" diff --git a/receiver/googlecloudpubsubreceiver/receiver_test.go b/receiver/googlecloudpubsubreceiver/receiver_test.go index 9d32fa157cc4..337ab0dff152 100644 --- a/receiver/googlecloudpubsubreceiver/receiver_test.go +++ b/receiver/googlecloudpubsubreceiver/receiver_test.go @@ -10,6 +10,7 @@ import ( pb "cloud.google.com/go/pubsub/apiv1/pubsubpb" "cloud.google.com/go/pubsub/pstest" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" diff --git a/receiver/googlecloudpubsubreceiver/wrapped_subscriber_client.go b/receiver/googlecloudpubsubreceiver/wrapped_subscriber_client.go index de42218483ac..8f26d1d3dd5f 100644 --- a/receiver/googlecloudpubsubreceiver/wrapped_subscriber_client.go +++ b/receiver/googlecloudpubsubreceiver/wrapped_subscriber_client.go @@ -8,6 +8,7 @@ import ( "fmt" pubsub "cloud.google.com/go/pubsub/apiv1" + "google.golang.org/api/option" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/receiver/googlecloudpubsubreceiver/wrapped_subscriber_client_test.go b/receiver/googlecloudpubsubreceiver/wrapped_subscriber_client_test.go index 1f6543046c15..ac684da47d11 100644 --- a/receiver/googlecloudpubsubreceiver/wrapped_subscriber_client_test.go +++ b/receiver/googlecloudpubsubreceiver/wrapped_subscriber_client_test.go @@ -8,6 +8,7 @@ import ( "testing" pubsub "cloud.google.com/go/pubsub/apiv1" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/api/option" diff --git a/receiver/googlecloudspannerreceiver/config_test.go b/receiver/googlecloudspannerreceiver/config_test.go index 301012998ac9..2d5eeb8306ea 100644 --- a/receiver/googlecloudspannerreceiver/config_test.go +++ b/receiver/googlecloudspannerreceiver/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver/internal/metadata" @@ -185,7 +186,7 @@ func TestValidateConfig(t *testing.T) { Projects: testCase.projects, } - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) if testCase.requireError { require.Error(t, err) diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index d0e32a3e00cc..e2ac3022ac35 100644 --- a/receiver/googlecloudspannerreceiver/go.mod +++ b/receiver/googlecloudspannerreceiver/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/googlecloudspannerreceiver/go.sum b/receiver/googlecloudspannerreceiver/go.sum index 876dfb9f1039..a9ab178ad481 100644 --- a/receiver/googlecloudspannerreceiver/go.sum +++ b/receiver/googlecloudspannerreceiver/go.sum @@ -952,6 +952,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/googlecloudspannerreceiver/internal/datasource/database.go b/receiver/googlecloudspannerreceiver/internal/datasource/database.go index 9888e8c60ba4..6e9fb01bb232 100644 --- a/receiver/googlecloudspannerreceiver/internal/datasource/database.go +++ b/receiver/googlecloudspannerreceiver/internal/datasource/database.go @@ -7,6 +7,7 @@ import ( "context" "cloud.google.com/go/spanner" + "google.golang.org/api/option" ) diff --git a/receiver/googlecloudspannerreceiver/internal/datasource/database_test.go b/receiver/googlecloudspannerreceiver/internal/datasource/database_test.go index 2cd2bc44ffa8..c52455ae8189 100644 --- a/receiver/googlecloudspannerreceiver/internal/datasource/database_test.go +++ b/receiver/googlecloudspannerreceiver/internal/datasource/database_test.go @@ -8,6 +8,7 @@ import ( "testing" "cloud.google.com/go/spanner" + "github.com/stretchr/testify/assert" ) diff --git a/receiver/googlecloudspannerreceiver/internal/metadata/metricvalue.go b/receiver/googlecloudspannerreceiver/internal/metadata/metricvalue.go index 2abc157c1a86..321c2143cf56 100644 --- a/receiver/googlecloudspannerreceiver/internal/metadata/metricvalue.go +++ b/receiver/googlecloudspannerreceiver/internal/metadata/metricvalue.go @@ -7,6 +7,7 @@ import ( "fmt" "cloud.google.com/go/spanner" + "go.opentelemetry.io/collector/pdata/pmetric" ) diff --git a/receiver/googlecloudspannerreceiver/internal/statsreader/currentstatsreader.go b/receiver/googlecloudspannerreceiver/internal/statsreader/currentstatsreader.go index 89fc1e0cfaa3..7eb6d48302f2 100644 --- a/receiver/googlecloudspannerreceiver/internal/statsreader/currentstatsreader.go +++ b/receiver/googlecloudspannerreceiver/internal/statsreader/currentstatsreader.go @@ -10,6 +10,7 @@ import ( "time" "cloud.google.com/go/spanner" + "go.uber.org/zap" "google.golang.org/api/iterator" diff --git a/receiver/googlecloudspannerreceiver/internal/statsreader/currentstatsreader_test.go b/receiver/googlecloudspannerreceiver/internal/statsreader/currentstatsreader_test.go index e9f213a4b7b7..77f47bbd3fee 100644 --- a/receiver/googlecloudspannerreceiver/internal/statsreader/currentstatsreader_test.go +++ b/receiver/googlecloudspannerreceiver/internal/statsreader/currentstatsreader_test.go @@ -9,6 +9,7 @@ import ( "time" "cloud.google.com/go/spanner" + "github.com/stretchr/testify/assert" "go.uber.org/zap/zaptest" diff --git a/receiver/googlecloudspannerreceiver/internal/statsreader/databasereader_test.go b/receiver/googlecloudspannerreceiver/internal/statsreader/databasereader_test.go index b6f714596ca5..3fef47d3cb86 100644 --- a/receiver/googlecloudspannerreceiver/internal/statsreader/databasereader_test.go +++ b/receiver/googlecloudspannerreceiver/internal/statsreader/databasereader_test.go @@ -9,6 +9,7 @@ import ( "testing" "cloud.google.com/go/spanner" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/receiver/googlecloudspannerreceiver/internal/statsreader/intervalstatsreader_test.go b/receiver/googlecloudspannerreceiver/internal/statsreader/intervalstatsreader_test.go index 10b7112cf0e2..87281e2dcc24 100644 --- a/receiver/googlecloudspannerreceiver/internal/statsreader/intervalstatsreader_test.go +++ b/receiver/googlecloudspannerreceiver/internal/statsreader/intervalstatsreader_test.go @@ -9,6 +9,7 @@ import ( "time" "cloud.google.com/go/spanner" + "github.com/stretchr/testify/assert" "go.uber.org/zap/zaptest" diff --git a/receiver/googlecloudspannerreceiver/internal/statsreader/statsreaders_mockedspanner_test.go b/receiver/googlecloudspannerreceiver/internal/statsreader/statsreaders_mockedspanner_test.go index 6b750522373b..e8a45b7fe053 100644 --- a/receiver/googlecloudspannerreceiver/internal/statsreader/statsreaders_mockedspanner_test.go +++ b/receiver/googlecloudspannerreceiver/internal/statsreader/statsreaders_mockedspanner_test.go @@ -12,6 +12,7 @@ import ( database "cloud.google.com/go/spanner/admin/database/apiv1" "cloud.google.com/go/spanner/admin/database/apiv1/databasepb" "cloud.google.com/go/spanner/spannertest" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/pmetric" diff --git a/receiver/hostmetricsreceiver/config_test.go b/receiver/hostmetricsreceiver/config_test.go index e9a15a3565df..bb4546c482e2 100644 --- a/receiver/hostmetricsreceiver/config_test.go +++ b/receiver/hostmetricsreceiver/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterset" @@ -101,7 +102,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) require.Equal(t, tt.expected, cfg) }) } @@ -115,7 +116,7 @@ func TestLoadInvalidConfig_NoScrapers(t *testing.T) { require.NoError(t, err) require.NoError(t, cm.Unmarshal(cfg)) - require.ErrorContains(t, component.ValidateConfig(cfg), "must specify at least one scraper when using hostmetrics receiver") + require.ErrorContains(t, xconfmap.Validate(cfg), "must specify at least one scraper when using hostmetrics receiver") } func TestLoadInvalidConfig_InvalidScraperKey(t *testing.T) { diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index 7c94271b55b7..764fa0f5cdda 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -17,6 +17,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/featuregate v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/hostmetricsreceiver/go.sum b/receiver/hostmetricsreceiver/go.sum index f28704d5dc44..f59a28d2427e 100644 --- a/receiver/hostmetricsreceiver/go.sum +++ b/receiver/hostmetricsreceiver/go.sum @@ -159,6 +159,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/hostmetricsreceiver/hostmetrics_linux_test.go b/receiver/hostmetricsreceiver/hostmetrics_linux_test.go index 9a6723bb544c..a21e8258e86b 100644 --- a/receiver/hostmetricsreceiver/hostmetrics_linux_test.go +++ b/receiver/hostmetricsreceiver/hostmetrics_linux_test.go @@ -14,6 +14,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/cpuscraper" ) @@ -63,7 +64,7 @@ func TestLoadInvalidConfig_RootPathNotExist(t *testing.T) { cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config-bad-root-path.yaml")) require.NoError(t, err) require.NoError(t, cm.Unmarshal(cfg)) - assert.ErrorContains(t, component.ValidateConfig(cfg), "invalid root_path:") + assert.ErrorContains(t, xconfmap.Validate(cfg), "invalid root_path:") globalRootPath = "" } diff --git a/receiver/jaegerreceiver/config_test.go b/receiver/jaegerreceiver/config_test.go index e2bcaeb154c6..80be45903e14 100644 --- a/receiver/jaegerreceiver/config_test.go +++ b/receiver/jaegerreceiver/config_test.go @@ -15,6 +15,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver/internal/metadata" ) @@ -137,7 +138,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -234,7 +235,7 @@ func TestInvalidConfig(t *testing.T) { tC.apply(cfg) - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) assert.Error(t, err, tC.err) }) } diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index 19a79e9555dc..c8c24a48ca97 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -17,6 +17,7 @@ require ( go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/featuregate v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/jaegerreceiver/go.sum b/receiver/jaegerreceiver/go.sum index 08b92155e4b8..61f919b35505 100644 --- a/receiver/jaegerreceiver/go.sum +++ b/receiver/jaegerreceiver/go.sum @@ -153,6 +153,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/jmxreceiver/config_test.go b/receiver/jmxreceiver/config_test.go index 06b746ca781a..5fdd8f64a02d 100644 --- a/receiver/jmxreceiver/config_test.go +++ b/receiver/jmxreceiver/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver/internal/metadata" @@ -218,7 +219,7 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, tt.expected, cfg) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index 0df18b03b511..8d9bfbc23feb 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -14,6 +14,7 @@ require ( go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/k8sclusterreceiver/config_test.go b/receiver/k8sclusterreceiver/config_test.go index 8155050358f3..180011193bf5 100644 --- a/receiver/k8sclusterreceiver/config_test.go +++ b/receiver/k8sclusterreceiver/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/internal/metadata" @@ -71,7 +72,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -83,7 +84,7 @@ func TestInvalidConfig(t *testing.T) { Distribution: distributionKubernetes, CollectionInterval: 30 * time.Second, } - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) assert.Error(t, err) assert.ErrorContains(t, err, "invalid authType for kubernetes: ") @@ -94,7 +95,7 @@ func TestInvalidConfig(t *testing.T) { CollectionInterval: 30 * time.Second, } expectedErr := "\"wrong\" is not a supported distribution. Must be one of: \"openshift\", \"kubernetes\"" - err = component.ValidateConfig(cfg) + err = xconfmap.Validate(cfg) assert.Error(t, err) assert.ErrorContains(t, err, expectedErr) } diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 3bdf362b4a1f..29e24d72eedb 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/component/componentstatus v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/filter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/k8seventsreceiver/config_test.go b/receiver/k8seventsreceiver/config_test.go index ddb612bfee20..4e45afde71b7 100644 --- a/receiver/k8seventsreceiver/config_test.go +++ b/receiver/k8seventsreceiver/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver/internal/metadata" @@ -51,7 +52,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/k8seventsreceiver/go.mod b/receiver/k8seventsreceiver/go.mod index 62737d6f18e9..a9e175954785 100644 --- a/receiver/k8seventsreceiver/go.mod +++ b/receiver/k8seventsreceiver/go.mod @@ -8,6 +8,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/k8seventsreceiver/go.sum b/receiver/k8seventsreceiver/go.sum index e1e88689d2d7..d92412483cc7 100644 --- a/receiver/k8seventsreceiver/go.sum +++ b/receiver/k8seventsreceiver/go.sum @@ -261,6 +261,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/k8sobjectsreceiver/config_test.go b/receiver/k8sobjectsreceiver/config_test.go index de75fa4f7617..b1843d1b0f7a 100644 --- a/receiver/k8sobjectsreceiver/config_test.go +++ b/receiver/k8sobjectsreceiver/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "k8s.io/apimachinery/pkg/runtime/schema" apiWatch "k8s.io/apimachinery/pkg/watch" @@ -153,11 +154,11 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.expected == nil { - err = component.ValidateConfig(cfg) + err = xconfmap.Validate(cfg) assert.Error(t, err) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected.AuthType, cfg.AuthType) assert.Equal(t, tt.expected.Objects, cfg.Objects) }) diff --git a/receiver/k8sobjectsreceiver/go.mod b/receiver/k8sobjectsreceiver/go.mod index 862db36b6d65..155601f2a9b0 100644 --- a/receiver/k8sobjectsreceiver/go.mod +++ b/receiver/k8sobjectsreceiver/go.mod @@ -12,6 +12,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/kafkareceiver/config_test.go b/receiver/kafkareceiver/config_test.go index b5e7faa1dc93..063d165c3509 100644 --- a/receiver/kafkareceiver/config_test.go +++ b/receiver/kafkareceiver/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" @@ -114,7 +115,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index e5305f27fdcb..15fac4a70597 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index 6ee3a3cbfbb2..a1fa24ef60aa 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -171,6 +171,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/kafkareceiver/internal/metadata/generated_telemetry.go b/receiver/kafkareceiver/internal/metadata/generated_telemetry.go index da34eded8e01..93b0736b7ec4 100644 --- a/receiver/kafkareceiver/internal/metadata/generated_telemetry.go +++ b/receiver/kafkareceiver/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/receiver/kafkareceiver/internal/metadata/generated_telemetry_test.go b/receiver/kafkareceiver/internal/metadata/generated_telemetry_test.go index 93c12c77af4c..85dffd0578de 100644 --- a/receiver/kafkareceiver/internal/metadata/generated_telemetry_test.go +++ b/receiver/kafkareceiver/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/receiver/kafkareceiver/internal/metadatatest/generated_telemetrytest_test.go b/receiver/kafkareceiver/internal/metadatatest/generated_telemetrytest_test.go index 428d0b2f077e..849d2800d4d8 100644 --- a/receiver/kafkareceiver/internal/metadatatest/generated_telemetrytest_test.go +++ b/receiver/kafkareceiver/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/receiver/kubeletstatsreceiver/config_test.go b/receiver/kubeletstatsreceiver/config_test.go index 0a6285e43852..b03e9a8f8998 100644 --- a/receiver/kubeletstatsreceiver/config_test.go +++ b/receiver/kubeletstatsreceiver/config_test.go @@ -14,6 +14,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" @@ -296,7 +297,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - err = component.ValidateConfig(cfg) + err = xconfmap.Validate(cfg) if tt.expectedValidationErr != "" { assert.EqualError(t, err, tt.expectedValidationErr) } else { diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index fbaaa2001974..130c1636be52 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -16,6 +16,7 @@ require ( go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/featuregate v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/lokireceiver/config_test.go b/receiver/lokireceiver/config_test.go index 3524c41e607f..b4f2fb9d693b 100644 --- a/receiver/lokireceiver/config_test.go +++ b/receiver/lokireceiver/config_test.go @@ -14,6 +14,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/lokireceiver/internal/metadata" ) @@ -72,7 +73,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -101,7 +102,7 @@ func TestInvalidConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - err = component.ValidateConfig(cfg) + err = xconfmap.Validate(cfg) assert.Error(t, err, tt.err) }) } diff --git a/receiver/lokireceiver/go.mod b/receiver/lokireceiver/go.mod index d309a76e0b73..85177722aa26 100644 --- a/receiver/lokireceiver/go.mod +++ b/receiver/lokireceiver/go.mod @@ -29,6 +29,7 @@ require ( go.opentelemetry.io/collector/config/configgrpc v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/lokireceiver/go.sum b/receiver/lokireceiver/go.sum index e261465b0070..2f7f61f6e36a 100644 --- a/receiver/lokireceiver/go.sum +++ b/receiver/lokireceiver/go.sum @@ -152,6 +152,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/mongodbreceiver/config_test.go b/receiver/mongodbreceiver/config_test.go index 21f69c114092..4ee7df8d87e6 100644 --- a/receiver/mongodbreceiver/config_test.go +++ b/receiver/mongodbreceiver/config_test.go @@ -15,6 +15,7 @@ import ( "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver/internal/metadata" @@ -90,7 +91,7 @@ func TestValidate(t *testing.T) { Hosts: hosts, ControllerConfig: scraperhelper.NewDefaultControllerConfig(), } - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) if tc.expected == nil { require.NoError(t, err) } else { @@ -142,7 +143,7 @@ func TestBadTLSConfigs(t *testing.T) { ControllerConfig: scraperhelper.NewDefaultControllerConfig(), ClientConfig: tc.tlsConfig, } - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) if tc.expectError { require.Error(t, err) } else { diff --git a/receiver/mongodbreceiver/factory_test.go b/receiver/mongodbreceiver/factory_test.go index 54002f0b67f8..bec0272bd90b 100644 --- a/receiver/mongodbreceiver/factory_test.go +++ b/receiver/mongodbreceiver/factory_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/scraper/scraperhelper" @@ -25,7 +25,7 @@ func TestType(t *testing.T) { func TestValidConfig(t *testing.T) { factory := NewFactory() - require.NoError(t, component.ValidateConfig(factory.CreateDefaultConfig())) + require.NoError(t, xconfmap.Validate(factory.CreateDefaultConfig())) } func TestCreateMetrics(t *testing.T) { diff --git a/receiver/mongodbreceiver/go.mod b/receiver/mongodbreceiver/go.mod index 66d0f103576d..3f6a7e4d994d 100644 --- a/receiver/mongodbreceiver/go.mod +++ b/receiver/mongodbreceiver/go.mod @@ -17,6 +17,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/featuregate v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/mongodbreceiver/go.sum b/receiver/mongodbreceiver/go.sum index 1e7dca74b108..be95ad6a57f8 100644 --- a/receiver/mongodbreceiver/go.sum +++ b/receiver/mongodbreceiver/go.sum @@ -165,6 +165,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/mysqlreceiver/factory_test.go b/receiver/mysqlreceiver/factory_test.go index d6d6c549edcd..90357f99067b 100644 --- a/receiver/mysqlreceiver/factory_test.go +++ b/receiver/mysqlreceiver/factory_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confignet" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/scraper/scraperhelper" @@ -30,7 +30,7 @@ func TestValidConfig(t *testing.T) { cfg.Username = "otel" cfg.Password = "otel" cfg.Endpoint = "localhost:3306" - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) } func TestCreateMetrics(t *testing.T) { diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index e442223a0d4a..7835cee06065 100644 --- a/receiver/mysqlreceiver/go.mod +++ b/receiver/mysqlreceiver/go.mod @@ -16,6 +16,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/filter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/mysqlreceiver/go.sum b/receiver/mysqlreceiver/go.sum index 092b7283fd36..121bf2e13aae 100644 --- a/receiver/mysqlreceiver/go.sum +++ b/receiver/mysqlreceiver/go.sum @@ -154,6 +154,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/namedpipereceiver/go.mod b/receiver/namedpipereceiver/go.mod index eb60b255b5f1..c16d9f90b471 100644 --- a/receiver/namedpipereceiver/go.mod +++ b/receiver/namedpipereceiver/go.mod @@ -18,6 +18,7 @@ require ( require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/receiver/receivertest v0.119.1-0.20250210123122-44b3eeda354c ) diff --git a/receiver/namedpipereceiver/go.sum b/receiver/namedpipereceiver/go.sum index 6cc44f5c2c3e..324a88c07a9e 100644 --- a/receiver/namedpipereceiver/go.sum +++ b/receiver/namedpipereceiver/go.sum @@ -83,6 +83,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/namedpipereceiver/namedpipe_test.go b/receiver/namedpipereceiver/namedpipe_test.go index a13bc83e28c6..433492ab0f4a 100644 --- a/receiver/namedpipereceiver/namedpipe_test.go +++ b/receiver/namedpipereceiver/namedpipe_test.go @@ -17,6 +17,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" @@ -44,7 +45,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, testdataConfigYaml(), cfg) } diff --git a/receiver/netflowreceiver/config_test.go b/receiver/netflowreceiver/config_test.go index 2a51b8b783e1..3c6e27e3a255 100644 --- a/receiver/netflowreceiver/config_test.go +++ b/receiver/netflowreceiver/config_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/netflowreceiver/internal/metadata" ) @@ -70,7 +71,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -113,7 +114,7 @@ func TestInvalidConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - err = component.ValidateConfig(cfg) + err = xconfmap.Validate(cfg) assert.ErrorContains(t, err, tt.err) }) } diff --git a/receiver/netflowreceiver/go.mod b/receiver/netflowreceiver/go.mod index 93964a1ecb78..0a40caaa8a56 100644 --- a/receiver/netflowreceiver/go.mod +++ b/receiver/netflowreceiver/go.mod @@ -8,6 +8,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/netflowreceiver/go.sum b/receiver/netflowreceiver/go.sum index e07e00c6d722..8cbd0d8ddb57 100644 --- a/receiver/netflowreceiver/go.sum +++ b/receiver/netflowreceiver/go.sum @@ -62,6 +62,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 58b8dd559905..236781f79bc2 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -15,6 +15,7 @@ require ( go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index 1f6ec6dd7529..f9f4b5b1c0c7 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -162,6 +162,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/nginxreceiver/scraper_test.go b/receiver/nginxreceiver/scraper_test.go index 497b5b3cbb03..5a4237f8bbcc 100644 --- a/receiver/nginxreceiver/scraper_test.go +++ b/receiver/nginxreceiver/scraper_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" @@ -29,7 +29,7 @@ func TestScraper(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Endpoint = nginxMock.URL + "/status" - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) scraper := newNginxScraper(receivertest.NewNopSettings(), cfg) diff --git a/receiver/nsxtreceiver/factory_test.go b/receiver/nsxtreceiver/factory_test.go index 134ed85e8e8e..ac3387d6e09e 100644 --- a/receiver/nsxtreceiver/factory_test.go +++ b/receiver/nsxtreceiver/factory_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/scraper/scraperhelper" @@ -25,7 +25,7 @@ func TestType(t *testing.T) { func TestDefaultConfig(t *testing.T) { factory := NewFactory() - err := component.ValidateConfig(factory.CreateDefaultConfig()) + err := xconfmap.Validate(factory.CreateDefaultConfig()) // default does not endpoint require.ErrorContains(t, err, "no manager endpoint was specified") } diff --git a/receiver/nsxtreceiver/go.mod b/receiver/nsxtreceiver/go.mod index 1e5f45b193a0..fd49e2fe9187 100644 --- a/receiver/nsxtreceiver/go.mod +++ b/receiver/nsxtreceiver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/filter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/nsxtreceiver/go.sum b/receiver/nsxtreceiver/go.sum index 1763e01922bd..2568c0d651c1 100644 --- a/receiver/nsxtreceiver/go.sum +++ b/receiver/nsxtreceiver/go.sum @@ -92,6 +92,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/opencensusreceiver/config_test.go b/receiver/opencensusreceiver/config_test.go index 330bfbc5a9bb..a9627932c039 100644 --- a/receiver/opencensusreceiver/config_test.go +++ b/receiver/opencensusreceiver/config_test.go @@ -15,6 +15,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver/internal/metadata" ) @@ -140,7 +141,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index 0170e16cf212..aabc4f422f74 100644 --- a/receiver/opencensusreceiver/go.mod +++ b/receiver/opencensusreceiver/go.mod @@ -18,6 +18,7 @@ require ( go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/opencensusreceiver/go.sum b/receiver/opencensusreceiver/go.sum index 01ae2e4fbe6d..53ed908573e3 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -132,6 +132,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/otelarrowreceiver/config_test.go b/receiver/otelarrowreceiver/config_test.go index d50edab9fac2..fb4bb3fbe9cf 100644 --- a/receiver/otelarrowreceiver/config_test.go +++ b/receiver/otelarrowreceiver/config_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" ) func TestUnmarshalDefaultConfig(t *testing.T) { @@ -157,5 +157,5 @@ func TestUnmarshalConfigNoProtocols(t *testing.T) { cfg := Config{} // This now produces an error due to breaking change. // https://github.com/open-telemetry/opentelemetry-collector/pull/9385 - assert.ErrorContains(t, component.ValidateConfig(cfg), "invalid transport type") + assert.ErrorContains(t, xconfmap.Validate(cfg), "invalid transport type") } diff --git a/receiver/otelarrowreceiver/go.mod b/receiver/otelarrowreceiver/go.mod index cfea1b4ef6d0..44539c827bd6 100644 --- a/receiver/otelarrowreceiver/go.mod +++ b/receiver/otelarrowreceiver/go.mod @@ -17,6 +17,7 @@ require ( go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/otelarrowreceiver/go.sum b/receiver/otelarrowreceiver/go.sum index fef8bf64cf7f..6b19455db01f 100644 --- a/receiver/otelarrowreceiver/go.sum +++ b/receiver/otelarrowreceiver/go.sum @@ -125,6 +125,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/podmanreceiver/config_test.go b/receiver/podmanreceiver/config_test.go index 5cb0e40be0d3..c09339fa0cd0 100644 --- a/receiver/podmanreceiver/config_test.go +++ b/receiver/podmanreceiver/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver/internal/metadata" @@ -75,12 +76,12 @@ func TestLoadConfig(t *testing.T) { if len(tt.expectedErrMsgs) > 0 { for _, msg := range tt.expectedErrMsgs { - assert.ErrorContains(t, component.ValidateConfig(cfg), msg) + assert.ErrorContains(t, xconfmap.Validate(cfg), msg) } return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index 01c071ffd9cf..39bd69b082ff 100644 --- a/receiver/podmanreceiver/go.mod +++ b/receiver/podmanreceiver/go.mod @@ -9,6 +9,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/filter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/podmanreceiver/go.sum b/receiver/podmanreceiver/go.sum index ef9594186817..7d23b5e49e98 100644 --- a/receiver/podmanreceiver/go.sum +++ b/receiver/podmanreceiver/go.sum @@ -60,6 +60,8 @@ go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3e go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:sW0t0iI/VfRL9VYX7Ik6XzVgPcR+Y5kejTLsYcMyDWs= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/postgresqlreceiver/config_test.go b/receiver/postgresqlreceiver/config_test.go index 73d5c637dde8..30b259f9e01b 100644 --- a/receiver/postgresqlreceiver/config_test.go +++ b/receiver/postgresqlreceiver/config_test.go @@ -15,6 +15,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver/internal/metadata" ) @@ -102,7 +103,7 @@ func TestValidate(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) tC.defaultConfigModifier(cfg) - actual := component.ValidateConfig(cfg) + actual := xconfmap.Validate(cfg) if len(tC.expected) > 0 { for _, err := range tC.expected { require.ErrorContains(t, actual, err.Error()) diff --git a/receiver/postgresqlreceiver/factory_test.go b/receiver/postgresqlreceiver/factory_test.go index 245e1a2a057e..b135a80b1491 100644 --- a/receiver/postgresqlreceiver/factory_test.go +++ b/receiver/postgresqlreceiver/factory_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/scraper/scraperhelper" @@ -28,7 +28,7 @@ func TestValidConfig(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Username = "otel" cfg.Password = "otel" - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) } func TestCreateMetrics(t *testing.T) { diff --git a/receiver/postgresqlreceiver/go.mod b/receiver/postgresqlreceiver/go.mod index c3a06d06dbcc..a389d5b2ef7f 100644 --- a/receiver/postgresqlreceiver/go.mod +++ b/receiver/postgresqlreceiver/go.mod @@ -17,6 +17,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/featuregate v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/postgresqlreceiver/go.sum b/receiver/postgresqlreceiver/go.sum index a25aa1057728..d89c63bd2980 100644 --- a/receiver/postgresqlreceiver/go.sum +++ b/receiver/postgresqlreceiver/go.sum @@ -152,6 +152,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/prometheusreceiver/config_test.go b/receiver/prometheusreceiver/config_test.go index f0c5d144e569..2961a5d46f8b 100644 --- a/receiver/prometheusreceiver/config_test.go +++ b/receiver/prometheusreceiver/config_test.go @@ -16,6 +16,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/receiver/receivertest" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" @@ -67,7 +68,7 @@ func TestLoadTargetAllocatorConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(metadata.Type, "").String()) require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) r0 := cfg.(*Config) assert.NotNil(t, r0.PrometheusConfig) @@ -82,7 +83,7 @@ func TestLoadTargetAllocatorConfig(t *testing.T) { require.NoError(t, err) cfg = factory.CreateDefaultConfig() require.NoError(t, sub.Unmarshal(cfg)) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) r1 := cfg.(*Config) assert.NotNil(t, r0.PrometheusConfig) @@ -98,7 +99,7 @@ func TestLoadTargetAllocatorConfig(t *testing.T) { require.NoError(t, err) cfg = factory.CreateDefaultConfig() require.NoError(t, sub.Unmarshal(cfg)) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) r2 := cfg.(*Config) assert.Len(t, r2.PrometheusConfig.ScrapeConfigs, 1) @@ -116,7 +117,7 @@ func TestValidateConfigWithScrapeConfigFiles(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) } func TestLoadConfigFailsOnUnknownSection(t *testing.T) { @@ -139,25 +140,25 @@ func TestLoadConfigFailsOnNoPrometheusOrTAConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(metadata.Type, "").String()) require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - require.ErrorContains(t, component.ValidateConfig(cfg), "no Prometheus scrape_configs or target_allocator set") + require.ErrorContains(t, xconfmap.Validate(cfg), "no Prometheus scrape_configs or target_allocator set") cfg = factory.CreateDefaultConfig() sub, err = cm.Sub(component.NewIDWithName(metadata.Type, "withConfigAndTA").String()) require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) cfg = factory.CreateDefaultConfig() sub, err = cm.Sub(component.NewIDWithName(metadata.Type, "withOnlyTA").String()) require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) cfg = factory.CreateDefaultConfig() sub, err = cm.Sub(component.NewIDWithName(metadata.Type, "withOnlyScrape").String()) require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) } // As one of the config parameters is consuming prometheus @@ -205,7 +206,7 @@ func TestRejectUnsupportedPrometheusFeatures(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - err = component.ValidateConfig(cfg) + err = xconfmap.Validate(cfg) require.Error(t, err) wantErrMsg := `unsupported features: @@ -230,7 +231,7 @@ func TestNonExistentAuthCredentialsFile(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) assert.ErrorContains(t, - component.ValidateConfig(cfg), + xconfmap.Validate(cfg), `error checking authorization credentials file "/nonexistentauthcredentialsfile"`) } @@ -245,7 +246,7 @@ func TestTLSConfigNonExistentCertFile(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) assert.ErrorContains(t, - component.ValidateConfig(cfg), + xconfmap.Validate(cfg), `error checking client cert file "/nonexistentcertfile"`) } @@ -260,7 +261,7 @@ func TestTLSConfigNonExistentKeyFile(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) assert.ErrorContains(t, - component.ValidateConfig(cfg), + xconfmap.Validate(cfg), `error checking client key file "/nonexistentkeyfile"`) } @@ -315,7 +316,7 @@ func TestFileSDConfigJsonNilTargetGroup(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) } func TestFileSDConfigYamlNilTargetGroup(t *testing.T) { @@ -328,7 +329,7 @@ func TestFileSDConfigYamlNilTargetGroup(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) } func TestTargetAllocatorInvalidHTTPScrape(t *testing.T) { @@ -352,5 +353,5 @@ func TestFileSDConfigWithoutSDFile(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) } diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index 92c271523e85..88708ecfe7b3 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -22,6 +22,7 @@ require ( go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter v0.119.1-0.20250210123122-44b3eeda354c @@ -176,7 +177,6 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/config/configretry v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/config/configtelemetry v0.119.1-0.20250210123122-44b3eeda354c // indirect - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 // indirect go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/xconnector v0.119.1-0.20250210123122-44b3eeda354c // indirect diff --git a/receiver/prometheusreceiver/go.sum b/receiver/prometheusreceiver/go.sum index 9fbe83be0c66..4deee8e682d7 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -604,8 +604,8 @@ go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:L go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c h1:M3yM3YZpZMjIjwAlynt7Acj0tscLuaeCwKy6K0hNzGo= go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:5xaAHjqx9mlcXxDCeUrZXkEfWk9suMqMKspK41XNelc= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 h1:BgAdd947V9z5fnOb3mQf/5UhFFA3dhYKdG78t4mWIuo= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c h1:mwG3+ASFnw01qNc1SM23L2OnFIoR3XaALy67ymuF3/o= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:rAzQkXy+CIR8N1bfc5Y1nQ2fhN1XyXWAKOKQ76c1Xuw= go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c h1:F0bQSB7lVDbcUy48XgCcDaVvNQvFa01AFGkGENm1mPo= diff --git a/receiver/prometheusreceiver/targetallocator/config_test.go b/receiver/prometheusreceiver/targetallocator/config_test.go index 650da0327eac..8c18f9c52382 100644 --- a/receiver/prometheusreceiver/targetallocator/config_test.go +++ b/receiver/prometheusreceiver/targetallocator/config_test.go @@ -11,9 +11,9 @@ import ( promConfig "github.com/prometheus/common/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" ) func TestComponentConfigStruct(t *testing.T) { @@ -28,7 +28,7 @@ func TestLoadTargetAllocatorConfig(t *testing.T) { sub, err := cm.Sub("target_allocator") require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, "http://localhost:8080", cfg.ClientConfig.Endpoint) assert.Equal(t, 5*time.Second, cfg.ClientConfig.Timeout) @@ -39,31 +39,31 @@ func TestLoadTargetAllocatorConfig(t *testing.T) { func TestPromHTTPClientConfigValidateAuthorization(t *testing.T) { cfg := PromHTTPClientConfig{} - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) cfg.Authorization = &promConfig.Authorization{} - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) cfg.Authorization.CredentialsFile = "none" - require.Error(t, component.ValidateConfig(cfg)) + require.Error(t, xconfmap.Validate(cfg)) cfg.Authorization.CredentialsFile = filepath.Join("testdata", "dummy-tls-cert-file") - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) } func TestPromHTTPClientConfigValidateTLSConfig(t *testing.T) { cfg := PromHTTPClientConfig{} - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) cfg.TLSConfig.CertFile = "none" - require.Error(t, component.ValidateConfig(cfg)) + require.Error(t, xconfmap.Validate(cfg)) cfg.TLSConfig.CertFile = filepath.Join("testdata", "dummy-tls-cert-file") cfg.TLSConfig.KeyFile = "none" - require.Error(t, component.ValidateConfig(cfg)) + require.Error(t, xconfmap.Validate(cfg)) cfg.TLSConfig.KeyFile = filepath.Join("testdata", "dummy-tls-key-file") - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) } func TestPromHTTPClientConfigValidateMain(t *testing.T) { cfg := PromHTTPClientConfig{} - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) cfg.BearerToken = "foo" cfg.BearerTokenFile = filepath.Join("testdata", "dummy-tls-key-file") - require.Error(t, component.ValidateConfig(cfg)) + require.Error(t, xconfmap.Validate(cfg)) } diff --git a/receiver/purefareceiver/config_test.go b/receiver/purefareceiver/config_test.go index 8c7799b648d9..1970c23e6e4f 100644 --- a/receiver/purefareceiver/config_test.go +++ b/receiver/purefareceiver/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/purefareceiver/internal/metadata" ) @@ -57,7 +58,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) expected := factory.CreateDefaultConfig().(*Config) diff --git a/receiver/purefareceiver/go.mod b/receiver/purefareceiver/go.mod index 94d4bf600972..67834f11da94 100644 --- a/receiver/purefareceiver/go.mod +++ b/receiver/purefareceiver/go.mod @@ -14,6 +14,7 @@ require ( go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/purefareceiver/go.sum b/receiver/purefareceiver/go.sum index d3fed15f5791..bd5dc9ebe3bc 100644 --- a/receiver/purefareceiver/go.sum +++ b/receiver/purefareceiver/go.sum @@ -600,8 +600,8 @@ go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:L go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c h1:M3yM3YZpZMjIjwAlynt7Acj0tscLuaeCwKy6K0hNzGo= go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:5xaAHjqx9mlcXxDCeUrZXkEfWk9suMqMKspK41XNelc= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 h1:BgAdd947V9z5fnOb3mQf/5UhFFA3dhYKdG78t4mWIuo= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c h1:mwG3+ASFnw01qNc1SM23L2OnFIoR3XaALy67ymuF3/o= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:rAzQkXy+CIR8N1bfc5Y1nQ2fhN1XyXWAKOKQ76c1Xuw= go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c h1:F0bQSB7lVDbcUy48XgCcDaVvNQvFa01AFGkGENm1mPo= diff --git a/receiver/purefbreceiver/config_test.go b/receiver/purefbreceiver/config_test.go index dc421bc5b033..3c809836d7dd 100644 --- a/receiver/purefbreceiver/config_test.go +++ b/receiver/purefbreceiver/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/purefbreceiver/internal/metadata" ) @@ -51,7 +52,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) expected := factory.CreateDefaultConfig().(*Config) diff --git a/receiver/purefbreceiver/go.mod b/receiver/purefbreceiver/go.mod index 89de983e3881..5989ae80afff 100644 --- a/receiver/purefbreceiver/go.mod +++ b/receiver/purefbreceiver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/extensiontest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/purefbreceiver/go.sum b/receiver/purefbreceiver/go.sum index d3fed15f5791..bd5dc9ebe3bc 100644 --- a/receiver/purefbreceiver/go.sum +++ b/receiver/purefbreceiver/go.sum @@ -600,8 +600,8 @@ go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:L go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c h1:M3yM3YZpZMjIjwAlynt7Acj0tscLuaeCwKy6K0hNzGo= go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:5xaAHjqx9mlcXxDCeUrZXkEfWk9suMqMKspK41XNelc= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 h1:BgAdd947V9z5fnOb3mQf/5UhFFA3dhYKdG78t4mWIuo= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c h1:mwG3+ASFnw01qNc1SM23L2OnFIoR3XaALy67ymuF3/o= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:rAzQkXy+CIR8N1bfc5Y1nQ2fhN1XyXWAKOKQ76c1Xuw= go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c h1:F0bQSB7lVDbcUy48XgCcDaVvNQvFa01AFGkGENm1mPo= diff --git a/receiver/receivercreator/config_test.go b/receiver/receivercreator/config_test.go index 90533da89476..0bd5bcda7f4e 100644 --- a/receiver/receivercreator/config_test.go +++ b/receiver/receivercreator/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/otelcol" "go.opentelemetry.io/collector/otelcol/otelcoltest" @@ -133,7 +134,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index f73ecff2c6ca..89775a761f15 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -14,6 +14,7 @@ require ( go.opentelemetry.io/collector/component/componentstatus v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension v0.119.1-0.20250210123122-44b3eeda354c @@ -75,7 +76,6 @@ require ( go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 // indirect go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/xconnector v0.119.1-0.20250210123122-44b3eeda354c // indirect diff --git a/receiver/receivercreator/runner.go b/receiver/receivercreator/runner.go index aa7f3a8194de..391595e160f9 100644 --- a/receiver/receivercreator/runner.go +++ b/receiver/receivercreator/runner.go @@ -12,6 +12,7 @@ import ( "github.com/spf13/cast" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pipeline" rcvr "go.opentelemetry.io/collector/receiver" @@ -137,7 +138,7 @@ func (run *receiverRunner) loadRuntimeReceiverConfig( if err := mergedConfig.Unmarshal(receiverCfg); err != nil { return nil, "", fmt.Errorf("failed to load %q template config: %w", receiver.id.String(), err) } - if err := component.ValidateConfig(receiverCfg); err != nil { + if err := xconfmap.Validate(receiverCfg); err != nil { return nil, "", fmt.Errorf("invalid runtime receiver config: receivers::%s: %w", receiver.id, err) } return receiverCfg, targetEndpoint, nil diff --git a/receiver/saphanareceiver/config_test.go b/receiver/saphanareceiver/config_test.go index 4b837c836c4c..db390590093d 100644 --- a/receiver/saphanareceiver/config_test.go +++ b/receiver/saphanareceiver/config_test.go @@ -14,6 +14,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/saphanareceiver/internal/metadata" @@ -65,7 +66,7 @@ func TestValidate(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) tC.defaultConfigModifier(cfg) - actual := component.ValidateConfig(cfg) + actual := xconfmap.Validate(cfg) if tC.expected != nil { require.ErrorContains(t, actual, tC.expected.Error()) diff --git a/receiver/saphanareceiver/factory_test.go b/receiver/saphanareceiver/factory_test.go index 0a2639221482..8fd77b918bba 100644 --- a/receiver/saphanareceiver/factory_test.go +++ b/receiver/saphanareceiver/factory_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/scraper/scraperhelper" @@ -28,7 +28,7 @@ func TestValidConfig(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.Username = "otel" cfg.Password = "otel" - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) } func TestCreateMetrics(t *testing.T) { diff --git a/receiver/saphanareceiver/go.mod b/receiver/saphanareceiver/go.mod index b17273c68441..9048c4e1645f 100644 --- a/receiver/saphanareceiver/go.mod +++ b/receiver/saphanareceiver/go.mod @@ -14,6 +14,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/filter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/saphanareceiver/go.sum b/receiver/saphanareceiver/go.sum index 31199bd4388c..a14d8c968a8d 100644 --- a/receiver/saphanareceiver/go.sum +++ b/receiver/saphanareceiver/go.sum @@ -72,6 +72,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/sapmreceiver/config_test.go b/receiver/sapmreceiver/config_test.go index b7a62ba59d9e..937aa2365c7e 100644 --- a/receiver/sapmreceiver/config_test.go +++ b/receiver/sapmreceiver/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver/internal/metadata" ) @@ -64,7 +65,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index 7f8adea3bfad..9614f619af28 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -17,6 +17,7 @@ require ( go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index 55815a4171f6..f9edfbb2a1c8 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -99,6 +99,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/signalfxreceiver/config_test.go b/receiver/signalfxreceiver/config_test.go index 6254aa5a3640..e5a1c2cfb3ed 100644 --- a/receiver/signalfxreceiver/config_test.go +++ b/receiver/signalfxreceiver/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver/internal/metadata" @@ -71,7 +72,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index 7db26231704e..02cf184d0c9f 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -18,6 +18,7 @@ require ( go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index d8d6a5c6dab3..82930bf50f67 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -129,6 +129,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/simpleprometheusreceiver/config_test.go b/receiver/simpleprometheusreceiver/config_test.go index 57165d2e22be..f5d892d4c490 100644 --- a/receiver/simpleprometheusreceiver/config_test.go +++ b/receiver/simpleprometheusreceiver/config_test.go @@ -15,6 +15,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver/internal/metadata" ) @@ -91,7 +92,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index 9a5c4c3af199..dff30b9d71d1 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -12,6 +12,7 @@ require ( go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/receiver v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index b66d0743a109..19548db8e56f 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -602,8 +602,8 @@ go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:L go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c h1:M3yM3YZpZMjIjwAlynt7Acj0tscLuaeCwKy6K0hNzGo= go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:5xaAHjqx9mlcXxDCeUrZXkEfWk9suMqMKspK41XNelc= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 h1:BgAdd947V9z5fnOb3mQf/5UhFFA3dhYKdG78t4mWIuo= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c h1:mwG3+ASFnw01qNc1SM23L2OnFIoR3XaALy67ymuF3/o= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:rAzQkXy+CIR8N1bfc5Y1nQ2fhN1XyXWAKOKQ76c1Xuw= go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c h1:F0bQSB7lVDbcUy48XgCcDaVvNQvFa01AFGkGENm1mPo= diff --git a/receiver/skywalkingreceiver/config_test.go b/receiver/skywalkingreceiver/config_test.go index a57c166c2385..f17fcfd1d12a 100644 --- a/receiver/skywalkingreceiver/config_test.go +++ b/receiver/skywalkingreceiver/config_test.go @@ -14,6 +14,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/skywalkingreceiver/internal/metadata" ) @@ -78,7 +79,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/skywalkingreceiver/go.mod b/receiver/skywalkingreceiver/go.mod index 60bab1e2db03..f4869c68fa0a 100644 --- a/receiver/skywalkingreceiver/go.mod +++ b/receiver/skywalkingreceiver/go.mod @@ -15,6 +15,7 @@ require ( go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/skywalkingreceiver/go.sum b/receiver/skywalkingreceiver/go.sum index 1abdfc54e990..c505485a9943 100644 --- a/receiver/skywalkingreceiver/go.sum +++ b/receiver/skywalkingreceiver/go.sum @@ -141,6 +141,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/skywalkingreceiver/internal/trace/tracing_report_service.go b/receiver/skywalkingreceiver/internal/trace/tracing_report_service.go index afbbed8ca192..e917962ba320 100644 --- a/receiver/skywalkingreceiver/internal/trace/tracing_report_service.go +++ b/receiver/skywalkingreceiver/internal/trace/tracing_report_service.go @@ -15,11 +15,12 @@ import ( "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/receiverhelper" "google.golang.org/protobuf/proto" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/skywalking" + common "skywalking.apache.org/repo/goapi/collect/common/v3" agent "skywalking.apache.org/repo/goapi/collect/language/agent/v3" v3 "skywalking.apache.org/repo/goapi/collect/language/agent/v3" - - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/skywalking" ) const ( diff --git a/receiver/skywalkingreceiver/skywalking_receiver.go b/receiver/skywalkingreceiver/skywalking_receiver.go index 8af7caec8b01..ef2334c93314 100644 --- a/receiver/skywalkingreceiver/skywalking_receiver.go +++ b/receiver/skywalkingreceiver/skywalking_receiver.go @@ -20,14 +20,15 @@ import ( "go.opentelemetry.io/collector/receiver" "go.uber.org/multierr" "google.golang.org/grpc" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/skywalkingreceiver/internal/metrics" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/skywalkingreceiver/internal/trace" + cds "skywalking.apache.org/repo/goapi/collect/agent/configuration/v3" event "skywalking.apache.org/repo/goapi/collect/event/v3" v3 "skywalking.apache.org/repo/goapi/collect/language/agent/v3" profile "skywalking.apache.org/repo/goapi/collect/language/profile/v3" management "skywalking.apache.org/repo/goapi/collect/management/v3" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/skywalkingreceiver/internal/metrics" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/skywalkingreceiver/internal/trace" ) // configuration defines the behavior and the ports that diff --git a/receiver/skywalkingreceiver/skywalking_receiver_test.go b/receiver/skywalkingreceiver/skywalking_receiver_test.go index 39e6b11f754f..c853b5ab7283 100644 --- a/receiver/skywalkingreceiver/skywalking_receiver_test.go +++ b/receiver/skywalkingreceiver/skywalking_receiver_test.go @@ -21,6 +21,7 @@ import ( "go.opentelemetry.io/collector/receiver/receivertest" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" + common "skywalking.apache.org/repo/goapi/collect/common/v3" agent "skywalking.apache.org/repo/goapi/collect/language/agent/v3" ) diff --git a/receiver/snmpreceiver/config_helper_test.go b/receiver/snmpreceiver/config_helper_test.go index a0eee7844409..f9b98a15ae12 100644 --- a/receiver/snmpreceiver/config_helper_test.go +++ b/receiver/snmpreceiver/config_helper_test.go @@ -5,7 +5,6 @@ package snmpreceiver // import "github.com/open-telemetry/opentelemetry-collecto import ( "testing" - // client is an autogenerated mock type for the client type "github.com/stretchr/testify/require" ) diff --git a/receiver/snmpreceiver/config_test.go b/receiver/snmpreceiver/config_test.go index 6746b7821893..0b508ebe2e53 100644 --- a/receiver/snmpreceiver/config_test.go +++ b/receiver/snmpreceiver/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snmpreceiver/internal/metadata" ) @@ -255,9 +256,9 @@ func TestLoadConfigConnectionConfigs(t *testing.T) { cfg := factory.CreateDefaultConfig() require.NoError(t, sub.Unmarshal(cfg)) if test.expectedErr == "" { - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) } else { - require.ErrorContains(t, component.ValidateConfig(cfg), test.expectedErr) + require.ErrorContains(t, xconfmap.Validate(cfg), test.expectedErr) } require.Equal(t, test.expectedCfg, cfg) @@ -999,9 +1000,9 @@ func TestLoadConfigMetricConfigs(t *testing.T) { cfg := factory.CreateDefaultConfig() require.NoError(t, sub.Unmarshal(cfg)) if test.expectedErr == "" { - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) } else { - require.ErrorContains(t, component.ValidateConfig(cfg), test.expectedErr) + require.ErrorContains(t, xconfmap.Validate(cfg), test.expectedErr) } require.Equal(t, test.expectedCfg, cfg) diff --git a/receiver/snmpreceiver/factory.go b/receiver/snmpreceiver/factory.go index 1719c259e7eb..6ac87fb9af5b 100644 --- a/receiver/snmpreceiver/factory.go +++ b/receiver/snmpreceiver/factory.go @@ -11,6 +11,7 @@ import ( "strings" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/scraper" @@ -105,5 +106,5 @@ func addMissingConfigDefaults(cfg *Config) error { } } - return component.ValidateConfig(cfg) + return xconfmap.Validate(cfg) } diff --git a/receiver/snmpreceiver/go.mod b/receiver/snmpreceiver/go.mod index 5ca1f78f89b6..28a397d0b468 100644 --- a/receiver/snmpreceiver/go.mod +++ b/receiver/snmpreceiver/go.mod @@ -12,6 +12,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/otelcol/otelcoltest v0.119.1-0.20250210123122-44b3eeda354c @@ -98,7 +99,6 @@ require ( go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/httpprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.25.1-0.20250210123122-44b3eeda354c // indirect - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 // indirect go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/xconnector v0.119.1-0.20250210123122-44b3eeda354c // indirect diff --git a/receiver/snowflakereceiver/config_test.go b/receiver/snowflakereceiver/config_test.go index 52441b045a77..c0e0f0823090 100644 --- a/receiver/snowflakereceiver/config_test.go +++ b/receiver/snowflakereceiver/config_test.go @@ -14,6 +14,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" @@ -133,7 +134,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() require.NoError(t, cmNoStr.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) diff := cmp.Diff(expected, cfg, cmpopts.IgnoreUnexported(metadata.MetricConfig{}), cmpopts.IgnoreUnexported(metadata.ResourceAttributeConfig{})) if diff != "" { diff --git a/receiver/snowflakereceiver/factory_test.go b/receiver/snowflakereceiver/factory_test.go index 586113487872..6eae7ab15f61 100644 --- a/receiver/snowflakereceiver/factory_test.go +++ b/receiver/snowflakereceiver/factory_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" @@ -22,13 +22,13 @@ func TestFactoryCreate(t *testing.T) { func TestDefaultConfig(t *testing.T) { cfg := createDefaultConfig().(*Config) - require.Error(t, component.ValidateConfig(cfg), "Validation succeeded on invalid cfg") + require.Error(t, xconfmap.Validate(cfg), "Validation succeeded on invalid cfg") cfg.Account = "account" cfg.Username = "uname" cfg.Password = "pwd" cfg.Warehouse = "warehouse" - require.NoError(t, component.ValidateConfig(cfg), "Failed to validate valid cfg") + require.NoError(t, xconfmap.Validate(cfg), "Failed to validate valid cfg") require.EqualValues(t, defaultDB, cfg.Database) require.EqualValues(t, defaultRole, cfg.Role) diff --git a/receiver/snowflakereceiver/go.mod b/receiver/snowflakereceiver/go.mod index 63633feccc4e..3081aebf9acb 100644 --- a/receiver/snowflakereceiver/go.mod +++ b/receiver/snowflakereceiver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/filter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/snowflakereceiver/go.sum b/receiver/snowflakereceiver/go.sum index 09f230f4c851..a54f76c7dcce 100644 --- a/receiver/snowflakereceiver/go.sum +++ b/receiver/snowflakereceiver/go.sum @@ -175,6 +175,8 @@ go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3e go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:sW0t0iI/VfRL9VYX7Ik6XzVgPcR+Y5kejTLsYcMyDWs= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/snowflakereceiver/scraper_test.go b/receiver/snowflakereceiver/scraper_test.go index 4bb297ac380c..024804eab1dd 100644 --- a/receiver/snowflakereceiver/scraper_test.go +++ b/receiver/snowflakereceiver/scraper_test.go @@ -11,8 +11,8 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" @@ -25,7 +25,7 @@ func TestScraper(t *testing.T) { cfg.Username = "uname" cfg.Password = "pwd" cfg.Warehouse = "warehouse" - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) if err != nil { t.Fatal("an error occurred when validating config", err) } @@ -67,7 +67,7 @@ func TestStart(t *testing.T) { cfg.Username = "uname" cfg.Password = "pwd" cfg.Warehouse = "warehouse" - require.NoError(t, component.ValidateConfig(cfg)) + require.NoError(t, xconfmap.Validate(cfg)) scraper := newSnowflakeMetricsScraper(receivertest.NewNopSettings(), cfg) err := scraper.start(context.Background(), componenttest.NewNopHost()) diff --git a/receiver/solacereceiver/config_test.go b/receiver/solacereceiver/config_test.go index 1f380e7a1d1d..08fadf7c4330 100644 --- a/receiver/solacereceiver/config_test.go +++ b/receiver/solacereceiver/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver/internal/metadata" ) @@ -71,10 +72,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.expectedErr != nil { - assert.ErrorContains(t, component.ValidateConfig(cfg), tt.expectedErr.Error()) + assert.ErrorContains(t, xconfmap.Validate(cfg), tt.expectedErr.Error()) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -83,7 +84,7 @@ func TestLoadConfig(t *testing.T) { func TestConfigValidateMissingAuth(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Queue = "someQueue" - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) assert.ErrorContains(t, err, errMissingAuthDetails.Error()) } @@ -92,14 +93,14 @@ func TestConfigValidateMultipleAuth(t *testing.T) { cfg.Queue = "someQueue" cfg.Auth.PlainText = &SaslPlainTextConfig{"Username", "Password"} cfg.Auth.XAuth2 = &SaslXAuth2Config{"Username", "Bearer"} - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) assert.ErrorContains(t, err, errTooManyAuthDetails.Error()) } func TestConfigValidateMissingQueue(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Auth.PlainText = &SaslPlainTextConfig{"Username", "Password"} - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) assert.ErrorContains(t, err, errMissingQueueName.Error()) } @@ -145,7 +146,7 @@ func TestConfigValidateSuccess(t *testing.T) { cfg := createDefaultConfig().(*Config) cfg.Queue = "someQueue" configure(cfg) - err := component.ValidateConfig(cfg) + err := xconfmap.Validate(cfg) assert.NoError(t, err) }) } diff --git a/receiver/solacereceiver/go.mod b/receiver/solacereceiver/go.mod index b3d1efe33d56..7442f26cfee3 100644 --- a/receiver/solacereceiver/go.mod +++ b/receiver/solacereceiver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/solacereceiver/go.sum b/receiver/solacereceiver/go.sum index 33f54ddd251e..05c9b69cedcd 100644 --- a/receiver/solacereceiver/go.sum +++ b/receiver/solacereceiver/go.sum @@ -68,6 +68,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/solacereceiver/internal/metadata/generated_telemetry.go b/receiver/solacereceiver/internal/metadata/generated_telemetry.go index d86a60cafda0..227799605974 100644 --- a/receiver/solacereceiver/internal/metadata/generated_telemetry.go +++ b/receiver/solacereceiver/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/receiver/solacereceiver/internal/metadata/generated_telemetry_test.go b/receiver/solacereceiver/internal/metadata/generated_telemetry_test.go index f91bb05256cb..d42b16f63b77 100644 --- a/receiver/solacereceiver/internal/metadata/generated_telemetry_test.go +++ b/receiver/solacereceiver/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/receiver/solacereceiver/internal/metadatatest/generated_telemetrytest_test.go b/receiver/solacereceiver/internal/metadatatest/generated_telemetrytest_test.go index dd18e84cb1d0..218b26b53d53 100644 --- a/receiver/solacereceiver/internal/metadatatest/generated_telemetrytest_test.go +++ b/receiver/solacereceiver/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/receiver/splunkhecreceiver/config_test.go b/receiver/splunkhecreceiver/config_test.go index 0d6ce134c869..eac8cc53a705 100644 --- a/receiver/splunkhecreceiver/config_test.go +++ b/receiver/splunkhecreceiver/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver/internal/metadata" @@ -91,7 +92,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index c2f48db9b701..eb0673b76fbc 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -19,6 +19,7 @@ require ( go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/exporter/exportertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index 84b1aba2ad15..7b14a3b92e84 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -160,6 +160,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/sqlqueryreceiver/config_test.go b/receiver/sqlqueryreceiver/config_test.go index 374fb808b3fc..1989fa66d372 100644 --- a/receiver/sqlqueryreceiver/config_test.go +++ b/receiver/sqlqueryreceiver/config_test.go @@ -12,6 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery" @@ -160,10 +161,10 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, sub.Unmarshal(cfg)) if tt.expected == nil { - assert.ErrorContains(t, component.ValidateConfig(cfg), tt.errorMessage) + assert.ErrorContains(t, xconfmap.Validate(cfg), tt.errorMessage) return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } @@ -185,7 +186,7 @@ func TestConfig_Validate_Multierr(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - err = component.ValidateConfig(cfg) + err = xconfmap.Validate(cfg) assert.ErrorContains(t, err, "invalid metric config with metric_name 'my.metric'") assert.ErrorContains(t, err, "metric config has unsupported value_type: 'xint'") diff --git a/receiver/sqlqueryreceiver/go.mod b/receiver/sqlqueryreceiver/go.mod index b37fa65eb9fc..8f3a30e6347c 100644 --- a/receiver/sqlqueryreceiver/go.mod +++ b/receiver/sqlqueryreceiver/go.mod @@ -26,6 +26,7 @@ require ( require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/extension/xextension v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/receiver/receivertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/sqlqueryreceiver/go.sum b/receiver/sqlqueryreceiver/go.sum index d621a61c4dae..511d90fd4078 100644 --- a/receiver/sqlqueryreceiver/go.sum +++ b/receiver/sqlqueryreceiver/go.sum @@ -300,6 +300,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/sqlserverreceiver/config_others_test.go b/receiver/sqlserverreceiver/config_others_test.go index 41516b303ea6..2f9b47474204 100644 --- a/receiver/sqlserverreceiver/config_others_test.go +++ b/receiver/sqlserverreceiver/config_others_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver/internal/metadata" @@ -80,9 +80,9 @@ func TestValidateOtherOS(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { if tc.expectedSuccess { - require.NoError(t, component.ValidateConfig(tc.cfg)) + require.NoError(t, xconfmap.Validate(tc.cfg)) } else { - require.Error(t, component.ValidateConfig(tc.cfg)) + require.Error(t, xconfmap.Validate(tc.cfg)) } }) } diff --git a/receiver/sqlserverreceiver/config_test.go b/receiver/sqlserverreceiver/config_test.go index eb0fd7726d03..8e4cefe9adbd 100644 --- a/receiver/sqlserverreceiver/config_test.go +++ b/receiver/sqlserverreceiver/config_test.go @@ -11,8 +11,8 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver/internal/metadata" @@ -69,9 +69,9 @@ func TestValidate(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { if tc.expectedSuccess { - require.NoError(t, component.ValidateConfig(tc.cfg)) + require.NoError(t, xconfmap.Validate(tc.cfg)) } else { - require.Error(t, component.ValidateConfig(tc.cfg)) + require.Error(t, xconfmap.Validate(tc.cfg)) } }) } @@ -88,7 +88,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, factory.CreateDefaultConfig(), cfg) }) @@ -121,7 +121,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) if diff := cmp.Diff(expected, cfg, cmpopts.IgnoreUnexported(metadata.MetricConfig{}), cmpopts.IgnoreUnexported(metadata.ResourceAttributeConfig{})); diff != "" { t.Errorf("Config mismatch (-expected +actual):\n%s", diff) } diff --git a/receiver/sqlserverreceiver/config_windows_test.go b/receiver/sqlserverreceiver/config_windows_test.go index 3beed9fae8f7..659faed5499e 100644 --- a/receiver/sqlserverreceiver/config_windows_test.go +++ b/receiver/sqlserverreceiver/config_windows_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver/internal/metadata" @@ -71,9 +71,9 @@ func TestValidateWindows(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { if tc.expectedSuccess { - require.NoError(t, component.ValidateConfig(tc.cfg)) + require.NoError(t, xconfmap.Validate(tc.cfg)) } else { - require.Error(t, component.ValidateConfig(tc.cfg)) + require.Error(t, xconfmap.Validate(tc.cfg)) } }) } diff --git a/receiver/sqlserverreceiver/go.mod b/receiver/sqlserverreceiver/go.mod index e701a391c128..5f538b862011 100644 --- a/receiver/sqlserverreceiver/go.mod +++ b/receiver/sqlserverreceiver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/filter v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/sqlserverreceiver/go.sum b/receiver/sqlserverreceiver/go.sum index 54f744f351ef..7fb4241ee27d 100644 --- a/receiver/sqlserverreceiver/go.sum +++ b/receiver/sqlserverreceiver/go.sum @@ -212,6 +212,8 @@ go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3e go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:sW0t0iI/VfRL9VYX7Ik6XzVgPcR+Y5kejTLsYcMyDWs= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/statsdreceiver/config_test.go b/receiver/statsdreceiver/config_test.go index 0ccda8f9132c..f755ea6f0920 100644 --- a/receiver/statsdreceiver/config_test.go +++ b/receiver/statsdreceiver/config_test.go @@ -15,6 +15,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/internal/metadata" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/internal/protocol" @@ -75,7 +76,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index 90c837f16a2f..8d1dce8de0ba 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index 39dadc48dba8..b1a7086d7506 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -68,6 +68,8 @@ go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:ZppUH1hgUJOubawEsxsQ9MzEYFytqo2GnVSS7d4CVxc= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/statsdreceiver/internal/metadata/generated_telemetry.go b/receiver/statsdreceiver/internal/metadata/generated_telemetry.go index 10c3ef475507..967f2ba3959a 100644 --- a/receiver/statsdreceiver/internal/metadata/generated_telemetry.go +++ b/receiver/statsdreceiver/internal/metadata/generated_telemetry.go @@ -6,10 +6,9 @@ import ( "errors" "sync" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" - - "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter { diff --git a/receiver/statsdreceiver/internal/metadata/generated_telemetry_test.go b/receiver/statsdreceiver/internal/metadata/generated_telemetry_test.go index d86c3da41767..bc15070eb96c 100644 --- a/receiver/statsdreceiver/internal/metadata/generated_telemetry_test.go +++ b/receiver/statsdreceiver/internal/metadata/generated_telemetry_test.go @@ -6,15 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/metric" embeddedmetric "go.opentelemetry.io/otel/metric/embedded" noopmetric "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" embeddedtrace "go.opentelemetry.io/otel/trace/embedded" nooptrace "go.opentelemetry.io/otel/trace/noop" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" ) type mockMeter struct { diff --git a/receiver/statsdreceiver/internal/metadatatest/generated_telemetrytest_test.go b/receiver/statsdreceiver/internal/metadatatest/generated_telemetrytest_test.go index 0eade05c25a1..d88912b07566 100644 --- a/receiver/statsdreceiver/internal/metadatatest/generated_telemetrytest_test.go +++ b/receiver/statsdreceiver/internal/metadatatest/generated_telemetrytest_test.go @@ -7,12 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/internal/metadata" - - "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) { diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index 41bc66582381..15719cbf174e 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -19,6 +19,7 @@ require ( require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/receiver/receivertest v0.119.1-0.20250210123122-44b3eeda354c ) diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index 422abd1c68c5..ab462d9e509b 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -89,6 +89,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/syslogreceiver/syslog_test.go b/receiver/syslogreceiver/syslog_test.go index 4fb2f940e9b5..a6213a233ef6 100644 --- a/receiver/syslogreceiver/syslog_test.go +++ b/receiver/syslogreceiver/syslog_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/receiver/receivertest" @@ -88,7 +88,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, testdataConfigYaml(), cfg) } diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index 52b6a1464361..1233ce9182a6 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -17,6 +17,7 @@ require ( require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/receiver/receivertest v0.119.1-0.20250210123122-44b3eeda354c ) diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index 422abd1c68c5..ab462d9e509b 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -89,6 +89,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/tcplogreceiver/tcp_test.go b/receiver/tcplogreceiver/tcp_test.go index 8a8fa3acba63..cbe07cd254ce 100644 --- a/receiver/tcplogreceiver/tcp_test.go +++ b/receiver/tcplogreceiver/tcp_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" @@ -73,7 +73,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, testdataConfigYaml(), cfg) } diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index 83a11d03a960..84efd91dd9c0 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -17,6 +17,7 @@ require ( require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/receiver/receivertest v0.119.1-0.20250210123122-44b3eeda354c ) diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index 951db2b2f012..a03482fdefca 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -81,6 +81,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/udplogreceiver/udp_test.go b/receiver/udplogreceiver/udp_test.go index 55db1ab974ed..4a5c7c3eddb0 100644 --- a/receiver/udplogreceiver/udp_test.go +++ b/receiver/udplogreceiver/udp_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" @@ -91,7 +91,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, testdataConfigYaml("127.0.0.1:29018"), cfg) } diff --git a/receiver/wavefrontreceiver/config_test.go b/receiver/wavefrontreceiver/config_test.go index 5c1828ea0b1f..afbdf18a06a3 100644 --- a/receiver/wavefrontreceiver/config_test.go +++ b/receiver/wavefrontreceiver/config_test.go @@ -13,6 +13,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver/internal/metadata" ) @@ -52,7 +53,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index d945370e841e..e64b06c9cfaf 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index eb1adbe2cce3..5e8c80f394c6 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -64,6 +64,8 @@ go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/confignet v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:ZppUH1hgUJOubawEsxsQ9MzEYFytqo2GnVSS7d4CVxc= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/webhookeventreceiver/config_test.go b/receiver/webhookeventreceiver/config_test.go index 3e119efb0d20..42051431cf40 100644 --- a/receiver/webhookeventreceiver/config_test.go +++ b/receiver/webhookeventreceiver/config_test.go @@ -11,6 +11,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/webhookeventreceiver/internal/metadata" @@ -140,7 +141,7 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() conf := factory.CreateDefaultConfig() require.NoError(t, cmNoStr.Unmarshal(conf)) - require.NoError(t, component.ValidateConfig(conf)) + require.NoError(t, xconfmap.Validate(conf)) require.Equal(t, expect, conf) } diff --git a/receiver/webhookeventreceiver/go.mod b/receiver/webhookeventreceiver/go.mod index 427623ac0df6..4b4562a24f85 100644 --- a/receiver/webhookeventreceiver/go.mod +++ b/receiver/webhookeventreceiver/go.mod @@ -11,6 +11,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/webhookeventreceiver/go.sum b/receiver/webhookeventreceiver/go.sum index fcf43ce9ca05..f019c401ca44 100644 --- a/receiver/webhookeventreceiver/go.sum +++ b/receiver/webhookeventreceiver/go.sum @@ -86,6 +86,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/windowsperfcountersreceiver/config_test.go b/receiver/windowsperfcountersreceiver/config_test.go index 8f231648d7d5..5ed5da7c188c 100644 --- a/receiver/windowsperfcountersreceiver/config_test.go +++ b/receiver/windowsperfcountersreceiver/config_test.go @@ -13,6 +13,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver/internal/metadata" @@ -222,11 +223,11 @@ func TestLoadConfig(t *testing.T) { if len(tt.expectedErrs) > 0 { for _, err := range tt.expectedErrs { - assert.ErrorContains(t, component.ValidateConfig(cfg), err) + assert.ErrorContains(t, xconfmap.Validate(cfg), err) } return } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/windowsperfcountersreceiver/factory_test.go b/receiver/windowsperfcountersreceiver/factory_test.go index 761dac6ad991..2dd58df91126 100644 --- a/receiver/windowsperfcountersreceiver/factory_test.go +++ b/receiver/windowsperfcountersreceiver/factory_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/confmap/xconfmap" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pipeline" "go.opentelemetry.io/collector/receiver/receivertest" @@ -39,7 +39,7 @@ func TestCreateDefaultConfig(t *testing.T) { }, } - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) } func TestCreateTraces(t *testing.T) { diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index 758f8527a2bf..5e3b95bf220e 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -10,6 +10,7 @@ require ( go.opentelemetry.io/collector/component v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/pdata v1.25.1-0.20250210123122-44b3eeda354c diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index c2602184f984..2156f0a46053 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -60,6 +60,8 @@ go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122- go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:qw0JC0EJRxKb7Dmqrdvg1dDs3Ovjprrry8cpF5Q0vF0= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/receiver/zipkinreceiver/config_test.go b/receiver/zipkinreceiver/config_test.go index bd648c540dd0..5c7ecf115fcc 100644 --- a/receiver/zipkinreceiver/config_test.go +++ b/receiver/zipkinreceiver/config_test.go @@ -12,6 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/confmap/xconfmap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver/internal/metadata" ) @@ -59,7 +60,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NoError(t, sub.Unmarshal(cfg)) - assert.NoError(t, component.ValidateConfig(cfg)) + assert.NoError(t, xconfmap.Validate(cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index 093923f7257b..409c9610434e 100644 --- a/receiver/zipkinreceiver/go.mod +++ b/receiver/zipkinreceiver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/config/confighttp v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c go.opentelemetry.io/collector/consumer/consumertest v0.119.1-0.20250210123122-44b3eeda354c diff --git a/receiver/zipkinreceiver/go.sum b/receiver/zipkinreceiver/go.sum index 4e25115468b0..8eba29c94068 100644 --- a/receiver/zipkinreceiver/go.sum +++ b/receiver/zipkinreceiver/go.sum @@ -95,6 +95,8 @@ go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda go.opentelemetry.io/collector/config/configtls v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:jE4WbJE12AltJ3BZU1R0GnYI8D14bTqbTq4yuaTHdms= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:LO+X9E8QkbObkjZMSSMnuQzAjQOTiF7EnXfmktg2NXw= go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c h1:Nu8zOAsLB1ChxAgb5DYOYSQkJGuUaHIH1LlmakLcuyk= go.opentelemetry.io/collector/consumer v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:wzomc+0FCV4FrgNP4SUF/7P1ux2iE7h4SAxVXk0+rv4= go.opentelemetry.io/collector/consumer/consumererror v0.119.1-0.20250210123122-44b3eeda354c h1:SSjo+YYRBgsE3fw426HrEku6WNoyP6MMXRycRZRxApE= diff --git a/testbed/go.mod b/testbed/go.mod index c13510a1df8c..044dadcdf729 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -270,7 +270,7 @@ require ( go.opentelemetry.io/collector/config/configauth v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/config/configopaque v1.25.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/config/configtelemetry v0.119.1-0.20250210123122-44b3eeda354c // indirect - go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 // indirect + go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 // indirect go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/connector/xconnector v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.119.1-0.20250210123122-44b3eeda354c // indirect diff --git a/testbed/go.sum b/testbed/go.sum index 19e0483f91a2..da1e35103ecd 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -786,8 +786,8 @@ go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c h1:L go.opentelemetry.io/collector/confmap v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c h1:M3yM3YZpZMjIjwAlynt7Acj0tscLuaeCwKy6K0hNzGo= go.opentelemetry.io/collector/confmap/provider/fileprovider v1.25.1-0.20250210123122-44b3eeda354c/go.mod h1:5xaAHjqx9mlcXxDCeUrZXkEfWk9suMqMKspK41XNelc= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1 h1:BgAdd947V9z5fnOb3mQf/5UhFFA3dhYKdG78t4mWIuo= -go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250205001856-68ff067415c1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1 h1:Q/JF1Noa73kZA2Ilbc4hs75kEMfSXiJLS6ryTkGrd/A= +go.opentelemetry.io/collector/confmap/xconfmap v0.0.0-20250210155359-76f44e1e21d1/go.mod h1:peCaQFeTl1OICAhG2BJWzv67a+6spi+6jGRVB6xXhcw= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c h1:mwG3+ASFnw01qNc1SM23L2OnFIoR3XaALy67ymuF3/o= go.opentelemetry.io/collector/connector v0.119.1-0.20250210123122-44b3eeda354c/go.mod h1:rAzQkXy+CIR8N1bfc5Y1nQ2fhN1XyXWAKOKQ76c1Xuw= go.opentelemetry.io/collector/connector/connectortest v0.119.1-0.20250210123122-44b3eeda354c h1:F0bQSB7lVDbcUy48XgCcDaVvNQvFa01AFGkGENm1mPo=