From 91b67e0306ded5544e9f3af3aba5f5b3b44ef65c Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Mon, 28 Nov 2022 15:09:22 -0800 Subject: [PATCH] Upgrade core, fix usage of deprecated component Configs Signed-off-by: Bogdan Drutu --- .../scripts/check-collector-module-version.sh | 9 +- cmd/configschema/go.mod | 28 +++--- cmd/configschema/go.sum | 56 ++++++------ cmd/mdatagen/go.mod | 6 +- cmd/mdatagen/go.sum | 12 +-- confmap/provider/s3provider/go.mod | 4 +- confmap/provider/s3provider/go.sum | 8 +- .../config_test.go | 4 +- .../alibabacloudlogserviceexporter/factory.go | 8 +- .../alibabacloudlogserviceexporter/go.mod | 12 +-- .../alibabacloudlogserviceexporter/go.sum | 24 ++--- .../logs_exporter.go | 2 +- .../metrics_exporter.go | 2 +- .../trace_exporter.go | 2 +- exporter/awscloudwatchlogsexporter/config.go | 2 +- .../awscloudwatchlogsexporter/config_test.go | 4 +- .../awscloudwatchlogsexporter/exporter.go | 2 +- exporter/awscloudwatchlogsexporter/factory.go | 4 +- exporter/awscloudwatchlogsexporter/go.mod | 10 +-- exporter/awscloudwatchlogsexporter/go.sum | 20 ++--- exporter/awsemfexporter/config_test.go | 4 +- exporter/awsemfexporter/emf_exporter.go | 6 +- exporter/awsemfexporter/factory.go | 4 +- exporter/awsemfexporter/factory_test.go | 4 +- exporter/awsemfexporter/go.mod | 12 +-- exporter/awsemfexporter/go.sum | 24 ++--- exporter/awskinesisexporter/config.go | 2 +- exporter/awskinesisexporter/config_test.go | 4 +- exporter/awskinesisexporter/exporter.go | 2 +- exporter/awskinesisexporter/factory.go | 8 +- exporter/awskinesisexporter/go.mod | 12 +-- exporter/awskinesisexporter/go.sum | 24 ++--- exporter/awsxrayexporter/awsxray.go | 4 +- exporter/awsxrayexporter/awsxray_test.go | 2 +- exporter/awsxrayexporter/config_test.go | 4 +- exporter/awsxrayexporter/factory.go | 4 +- exporter/awsxrayexporter/factory_test.go | 4 +- exporter/awsxrayexporter/go.mod | 12 +-- exporter/awsxrayexporter/go.sum | 24 ++--- .../azuredataexplorerexporter/config_test.go | 4 +- exporter/azuredataexplorerexporter/factory.go | 8 +- .../azuredataexplorerexporter/factory_test.go | 12 +-- exporter/azuredataexplorerexporter/go.mod | 10 +-- exporter/azuredataexplorerexporter/go.sum | 20 ++--- exporter/azuremonitorexporter/config_test.go | 4 +- exporter/azuremonitorexporter/factory.go | 6 +- exporter/azuremonitorexporter/go.mod | 12 +-- exporter/azuremonitorexporter/go.sum | 24 ++--- exporter/carbonexporter/config_test.go | 4 +- exporter/carbonexporter/factory.go | 4 +- exporter/carbonexporter/go.mod | 12 +-- exporter/carbonexporter/go.sum | 24 ++--- exporter/clickhouseexporter/config_test.go | 4 +- exporter/clickhouseexporter/factory.go | 6 +- exporter/clickhouseexporter/go.mod | 12 +-- exporter/clickhouseexporter/go.sum | 24 ++--- exporter/coralogixexporter/config_test.go | 8 +- exporter/coralogixexporter/factory.go | 8 +- exporter/coralogixexporter/go.mod | 12 +-- exporter/coralogixexporter/go.sum | 24 ++--- exporter/coralogixexporter/logs_client.go | 2 +- exporter/coralogixexporter/metrics_client.go | 2 +- exporter/coralogixexporter/traces_client.go | 2 +- exporter/datadogexporter/config.go | 4 +- exporter/datadogexporter/factory.go | 10 +-- exporter/datadogexporter/factory_test.go | 14 +-- exporter/datadogexporter/go.mod | 16 ++-- exporter/datadogexporter/go.sum | 32 +++---- exporter/dynatraceexporter/factory.go | 4 +- exporter/dynatraceexporter/factory_test.go | 4 +- exporter/dynatraceexporter/go.mod | 10 +-- exporter/dynatraceexporter/go.sum | 20 ++--- exporter/elasticsearchexporter/config_test.go | 6 +- exporter/elasticsearchexporter/factory.go | 6 +- exporter/elasticsearchexporter/go.mod | 10 +-- exporter/elasticsearchexporter/go.sum | 20 ++--- exporter/f5cloudexporter/config_test.go | 2 +- exporter/f5cloudexporter/factory.go | 8 +- exporter/f5cloudexporter/go.mod | 12 +-- exporter/f5cloudexporter/go.sum | 24 ++--- exporter/fileexporter/config.go | 2 +- exporter/fileexporter/config_test.go | 4 +- exporter/fileexporter/factory.go | 8 +- exporter/fileexporter/go.mod | 10 +-- exporter/fileexporter/go.sum | 20 ++--- exporter/googlecloudexporter/config_test.go | 4 +- exporter/googlecloudexporter/factory.go | 8 +- exporter/googlecloudexporter/go.mod | 14 +-- exporter/googlecloudexporter/go.sum | 28 +++--- .../googlecloudpubsubexporter/config_test.go | 4 +- exporter/googlecloudpubsubexporter/factory.go | 8 +- exporter/googlecloudpubsubexporter/go.mod | 10 +-- exporter/googlecloudpubsubexporter/go.sum | 20 ++--- .../factory.go | 4 +- .../googlemanagedprometheusexporter/go.mod | 14 +-- .../googlemanagedprometheusexporter/go.sum | 28 +++--- exporter/humioexporter/config_test.go | 4 +- exporter/humioexporter/factory.go | 4 +- exporter/humioexporter/factory_test.go | 2 +- exporter/humioexporter/go.mod | 12 +-- exporter/humioexporter/go.sum | 24 ++--- exporter/influxdbexporter/config_test.go | 4 +- exporter/influxdbexporter/factory.go | 8 +- exporter/influxdbexporter/go.mod | 10 +-- exporter/influxdbexporter/go.sum | 20 ++--- exporter/instanaexporter/config.go | 2 +- exporter/instanaexporter/exporter.go | 2 +- exporter/instanaexporter/factory.go | 4 +- exporter/instanaexporter/factory_test.go | 6 +- exporter/instanaexporter/go.mod | 12 +-- exporter/instanaexporter/go.sum | 24 ++--- exporter/jaegerexporter/config.go | 2 +- exporter/jaegerexporter/config_test.go | 4 +- exporter/jaegerexporter/factory.go | 4 +- exporter/jaegerexporter/go.mod | 12 +-- exporter/jaegerexporter/go.sum | 24 ++--- exporter/jaegerthrifthttpexporter/config.go | 2 +- .../jaegerthrifthttpexporter/config_test.go | 4 +- exporter/jaegerthrifthttpexporter/factory.go | 4 +- exporter/jaegerthrifthttpexporter/go.mod | 12 +-- exporter/jaegerthrifthttpexporter/go.sum | 24 ++--- exporter/kafkaexporter/config.go | 2 +- exporter/kafkaexporter/config_test.go | 4 +- exporter/kafkaexporter/factory.go | 8 +- exporter/kafkaexporter/go.mod | 12 +-- exporter/kafkaexporter/go.sum | 24 ++--- exporter/loadbalancingexporter/config_test.go | 2 +- exporter/loadbalancingexporter/factory.go | 6 +- exporter/loadbalancingexporter/go.mod | 16 ++-- exporter/loadbalancingexporter/go.sum | 32 +++---- .../loadbalancingexporter/loadbalancer.go | 2 +- .../loadbalancer_test.go | 8 +- .../loadbalancingexporter/log_exporter.go | 2 +- .../loadbalancingexporter/trace_exporter.go | 2 +- exporter/logzioexporter/config_test.go | 4 +- exporter/logzioexporter/factory.go | 6 +- exporter/logzioexporter/factory_test.go | 2 +- exporter/logzioexporter/go.mod | 12 +-- exporter/logzioexporter/go.sum | 24 ++--- exporter/lokiexporter/config_test.go | 4 +- exporter/lokiexporter/factory.go | 2 +- exporter/lokiexporter/factory_deprecated.go | 2 +- exporter/lokiexporter/go.mod | 12 +-- exporter/lokiexporter/go.sum | 24 ++--- exporter/lokiexporter/legacy_config_test.go | 4 +- exporter/mezmoexporter/config_test.go | 4 +- exporter/mezmoexporter/factory.go | 4 +- exporter/mezmoexporter/go.mod | 12 +-- exporter/mezmoexporter/go.sum | 24 ++--- exporter/opencensusexporter/config.go | 2 +- exporter/opencensusexporter/config_test.go | 4 +- exporter/opencensusexporter/factory.go | 6 +- exporter/opencensusexporter/go.mod | 12 +-- exporter/opencensusexporter/go.sum | 24 ++--- exporter/parquetexporter/factory.go | 8 +- exporter/parquetexporter/go.mod | 10 +-- exporter/parquetexporter/go.sum | 20 ++--- exporter/prometheusexporter/config.go | 2 +- exporter/prometheusexporter/config_test.go | 4 +- exporter/prometheusexporter/factory.go | 4 +- exporter/prometheusexporter/go.mod | 12 +-- exporter/prometheusexporter/go.sum | 26 +++--- .../prometheusremotewriteexporter/config.go | 2 +- .../config_test.go | 8 +- .../prometheusremotewriteexporter/factory.go | 4 +- .../factory_test.go | 2 +- exporter/prometheusremotewriteexporter/go.mod | 12 +-- exporter/prometheusremotewriteexporter/go.sum | 24 ++--- exporter/pulsarexporter/config.go | 2 +- exporter/pulsarexporter/config_test.go | 6 +- exporter/pulsarexporter/factory.go | 8 +- exporter/pulsarexporter/go.mod | 12 +-- exporter/pulsarexporter/go.sum | 24 ++--- exporter/sapmexporter/config_test.go | 4 +- exporter/sapmexporter/factory.go | 4 +- exporter/sapmexporter/go.mod | 12 +-- exporter/sapmexporter/go.sum | 24 ++--- exporter/sentryexporter/config_test.go | 4 +- exporter/sentryexporter/factory.go | 4 +- exporter/sentryexporter/go.mod | 12 +-- exporter/sentryexporter/go.sum | 24 ++--- exporter/signalfxexporter/config_test.go | 4 +- exporter/signalfxexporter/factory.go | 8 +- exporter/signalfxexporter/go.mod | 12 +-- exporter/signalfxexporter/go.sum | 24 ++--- exporter/skywalkingexporter/config.go | 2 +- exporter/skywalkingexporter/config_test.go | 4 +- exporter/skywalkingexporter/factory.go | 6 +- exporter/skywalkingexporter/go.mod | 12 +-- exporter/skywalkingexporter/go.sum | 24 ++--- exporter/splunkhecexporter/config_test.go | 4 +- exporter/splunkhecexporter/factory.go | 8 +- exporter/splunkhecexporter/go.mod | 12 +-- exporter/splunkhecexporter/go.sum | 24 ++--- exporter/sumologicexporter/factory.go | 6 +- exporter/sumologicexporter/go.mod | 10 +-- exporter/sumologicexporter/go.sum | 20 ++--- .../tanzuobservabilityexporter/factory.go | 6 +- exporter/tanzuobservabilityexporter/go.mod | 14 +-- exporter/tanzuobservabilityexporter/go.sum | 28 +++--- .../metrics_exporter.go | 2 +- .../trace_exporter.go | 2 +- .../tencentcloudlogserviceexporter/config.go | 2 +- .../config_test.go | 4 +- .../tencentcloudlogserviceexporter/factory.go | 4 +- .../tencentcloudlogserviceexporter/go.mod | 12 +-- .../tencentcloudlogserviceexporter/go.sum | 24 ++--- .../logs_exporter.go | 2 +- exporter/zipkinexporter/config.go | 2 +- exporter/zipkinexporter/config_test.go | 4 +- exporter/zipkinexporter/factory.go | 4 +- exporter/zipkinexporter/go.mod | 12 +-- exporter/zipkinexporter/go.sum | 24 ++--- extension/asapauthextension/config_test.go | 4 +- extension/asapauthextension/factory.go | 4 +- extension/asapauthextension/go.mod | 10 +-- extension/asapauthextension/go.sum | 20 ++--- extension/awsproxy/config_test.go | 4 +- extension/awsproxy/factory.go | 4 +- extension/awsproxy/go.mod | 10 +-- extension/awsproxy/go.sum | 20 ++--- extension/basicauthextension/config_test.go | 4 +- extension/basicauthextension/factory.go | 4 +- extension/basicauthextension/go.mod | 10 +-- extension/basicauthextension/go.sum | 20 ++--- extension/bearertokenauthextension/config.go | 2 +- .../bearertokenauthextension/config_test.go | 4 +- extension/bearertokenauthextension/factory.go | 4 +- extension/bearertokenauthextension/go.mod | 10 +-- extension/bearertokenauthextension/go.sum | 20 ++--- extension/fluentbitextension/config_test.go | 4 +- extension/fluentbitextension/factory.go | 4 +- extension/fluentbitextension/go.mod | 10 +-- extension/fluentbitextension/go.sum | 20 ++--- .../headerssetterextension/config_test.go | 4 +- extension/headerssetterextension/factory.go | 4 +- extension/headerssetterextension/go.mod | 10 +-- extension/headerssetterextension/go.sum | 20 ++--- extension/healthcheckextension/config.go | 2 +- extension/healthcheckextension/config_test.go | 4 +- extension/healthcheckextension/factory.go | 4 +- extension/healthcheckextension/go.mod | 10 +-- extension/healthcheckextension/go.sum | 20 ++--- extension/httpforwarder/config_test.go | 4 +- extension/httpforwarder/factory.go | 4 +- extension/httpforwarder/go.mod | 10 +-- extension/httpforwarder/go.sum | 20 ++--- extension/jaegerremotesampling/config.go | 2 +- extension/jaegerremotesampling/config_test.go | 4 +- extension/jaegerremotesampling/factory.go | 4 +- extension/jaegerremotesampling/go.mod | 10 +-- extension/jaegerremotesampling/go.sum | 20 ++--- extension/oauth2clientauthextension/config.go | 2 +- .../oauth2clientauthextension/config_test.go | 4 +- .../oauth2clientauthextension/factory.go | 4 +- extension/oauth2clientauthextension/go.mod | 10 +-- extension/oauth2clientauthextension/go.sum | 20 ++--- .../observer/dockerobserver/config_test.go | 4 +- extension/observer/dockerobserver/factory.go | 4 +- extension/observer/dockerobserver/go.mod | 10 +-- extension/observer/dockerobserver/go.sum | 20 ++--- extension/observer/ecsobserver/config_test.go | 8 +- extension/observer/ecsobserver/factory.go | 4 +- extension/observer/ecsobserver/go.mod | 10 +-- extension/observer/ecsobserver/go.sum | 20 ++--- .../observer/ecstaskobserver/config_test.go | 4 +- extension/observer/ecstaskobserver/factory.go | 4 +- extension/observer/ecstaskobserver/go.mod | 10 +-- extension/observer/ecstaskobserver/go.sum | 20 ++--- .../observer/hostobserver/config_test.go | 4 +- extension/observer/hostobserver/factory.go | 4 +- extension/observer/hostobserver/go.mod | 10 +-- extension/observer/hostobserver/go.sum | 20 ++--- extension/observer/k8sobserver/config.go | 2 +- extension/observer/k8sobserver/config_test.go | 4 +- extension/observer/k8sobserver/factory.go | 4 +- extension/observer/k8sobserver/go.mod | 10 +-- extension/observer/k8sobserver/go.sum | 20 ++--- extension/oidcauthextension/factory.go | 4 +- extension/oidcauthextension/go.mod | 10 +-- extension/oidcauthextension/go.sum | 20 ++--- extension/pprofextension/config.go | 2 +- extension/pprofextension/config_test.go | 4 +- extension/pprofextension/factory.go | 4 +- extension/pprofextension/go.mod | 10 +-- extension/pprofextension/go.sum | 20 ++--- extension/sigv4authextension/config.go | 4 +- extension/sigv4authextension/config_test.go | 4 +- extension/sigv4authextension/factory.go | 4 +- extension/sigv4authextension/go.mod | 10 +-- extension/sigv4authextension/go.sum | 20 ++--- extension/storage/dbstorage/factory.go | 4 +- extension/storage/filestorage/config_test.go | 6 +- extension/storage/filestorage/factory.go | 4 +- extension/storage/go.mod | 10 +-- extension/storage/go.sum | 20 ++--- go.mod | 28 +++--- go.sum | 56 ++++++------ internal/aws/containerinsight/go.mod | 2 +- internal/aws/containerinsight/go.sum | 4 +- internal/aws/cwlogs/go.mod | 10 +-- internal/aws/cwlogs/go.sum | 20 ++--- internal/aws/ecsutil/go.mod | 10 +-- internal/aws/ecsutil/go.sum | 20 ++--- internal/aws/proxy/go.mod | 4 +- internal/aws/proxy/go.sum | 8 +- internal/common/go.mod | 2 +- internal/common/go.sum | 4 +- internal/components/exporters_test.go | 90 +++++++++---------- internal/components/extensions_test.go | 34 +++---- internal/components/processors_test.go | 18 ++-- internal/components/receivers_test.go | 34 +++---- internal/coreinternal/go.mod | 6 +- internal/coreinternal/go.sum | 12 +-- internal/filter/go.mod | 12 +-- internal/filter/go.sum | 24 ++--- internal/k8sconfig/config.go | 1 + internal/kubelet/go.mod | 2 +- internal/kubelet/go.sum | 4 +- internal/scrapertest/go.mod | 2 +- internal/scrapertest/go.sum | 4 +- internal/sharedcomponent/go.mod | 10 +-- internal/sharedcomponent/go.sum | 20 ++--- internal/splunk/go.mod | 12 +-- internal/splunk/go.sum | 24 ++--- pkg/batchperresourceattr/go.mod | 4 +- pkg/batchperresourceattr/go.sum | 8 +- pkg/batchpersignal/go.mod | 2 +- pkg/batchpersignal/go.sum | 4 +- pkg/ottl/go.mod | 10 +-- pkg/ottl/go.sum | 20 ++--- pkg/resourcetotelemetry/go.mod | 10 +-- pkg/resourcetotelemetry/go.sum | 20 ++--- pkg/stanza/adapter/factory.go | 8 +- pkg/stanza/adapter/mocks_test.go | 6 +- pkg/stanza/go.mod | 10 +-- pkg/stanza/go.sum | 20 ++--- pkg/stanza/operator/operatortest/confmap.go | 2 +- pkg/translator/jaeger/go.mod | 4 +- pkg/translator/jaeger/go.sum | 8 +- pkg/translator/loki/go.mod | 2 +- pkg/translator/loki/go.sum | 4 +- pkg/translator/opencensus/go.mod | 4 +- pkg/translator/opencensus/go.sum | 8 +- pkg/translator/prometheus/go.mod | 4 +- pkg/translator/prometheus/go.sum | 8 +- pkg/translator/prometheusremotewrite/go.mod | 8 +- pkg/translator/prometheusremotewrite/go.sum | 18 ++-- pkg/translator/signalfx/go.mod | 2 +- pkg/translator/signalfx/go.sum | 4 +- pkg/translator/zipkin/go.mod | 4 +- pkg/translator/zipkin/go.sum | 8 +- processor/attributesprocessor/config.go | 2 +- processor/attributesprocessor/config_test.go | 4 +- processor/attributesprocessor/factory.go | 8 +- processor/attributesprocessor/go.mod | 12 +-- processor/attributesprocessor/go.sum | 24 ++--- .../cumulativetodeltaprocessor/config.go | 2 +- .../cumulativetodeltaprocessor/config_test.go | 4 +- .../cumulativetodeltaprocessor/factory.go | 4 +- .../factory_test.go | 2 +- processor/cumulativetodeltaprocessor/go.mod | 10 +-- processor/cumulativetodeltaprocessor/go.sum | 20 ++--- processor/deltatorateprocessor/config_test.go | 4 +- processor/deltatorateprocessor/factory.go | 4 +- .../deltatorateprocessor/factory_test.go | 2 +- processor/deltatorateprocessor/go.mod | 10 +-- processor/deltatorateprocessor/go.sum | 20 ++--- processor/filterprocessor/config.go | 2 +- processor/filterprocessor/config_test.go | 28 +++--- processor/filterprocessor/expr_test.go | 2 +- processor/filterprocessor/factory.go | 8 +- processor/filterprocessor/factory_test.go | 2 +- processor/filterprocessor/go.mod | 12 +-- processor/filterprocessor/go.sum | 24 ++--- .../groupbyattrsprocessor/config_test.go | 4 +- processor/groupbyattrsprocessor/factory.go | 8 +- processor/groupbyattrsprocessor/go.mod | 10 +-- processor/groupbyattrsprocessor/go.sum | 20 ++--- processor/groupbytraceprocessor/factory.go | 4 +- processor/groupbytraceprocessor/go.mod | 10 +-- processor/groupbytraceprocessor/go.sum | 20 ++--- .../k8sattributesprocessor/config_test.go | 4 +- processor/k8sattributesprocessor/factory.go | 24 ++--- processor/k8sattributesprocessor/go.mod | 12 +-- processor/k8sattributesprocessor/go.sum | 24 ++--- .../k8sattributesprocessor/processor_test.go | 8 +- processor/logstransformprocessor/config.go | 2 +- .../logstransformprocessor/config_test.go | 2 +- processor/logstransformprocessor/factory.go | 4 +- processor/logstransformprocessor/go.mod | 10 +-- processor/logstransformprocessor/go.sum | 20 ++--- .../metricsgenerationprocessor/config_test.go | 4 +- .../metricsgenerationprocessor/factory.go | 4 +- .../factory_test.go | 2 +- processor/metricsgenerationprocessor/go.mod | 10 +-- processor/metricsgenerationprocessor/go.sum | 20 ++--- .../metricstransformprocessor/config_test.go | 4 +- .../metricstransformprocessor/factory.go | 4 +- .../metricstransformprocessor/factory_test.go | 2 +- processor/metricstransformprocessor/go.mod | 10 +-- processor/metricstransformprocessor/go.sum | 20 ++--- .../probabilisticsamplerprocessor/config.go | 2 +- .../config_test.go | 4 +- .../probabilisticsamplerprocessor/factory.go | 4 +- .../probabilisticsamplerprocessor/go.mod | 12 +-- .../probabilisticsamplerprocessor/go.sum | 24 ++--- processor/redactionprocessor/config_test.go | 4 +- processor/redactionprocessor/factory.go | 4 +- processor/redactionprocessor/go.mod | 10 +-- processor/redactionprocessor/go.sum | 20 ++--- .../resourcedetectionprocessor/config.go | 5 -- .../resourcedetectionprocessor/config_test.go | 4 +- .../resourcedetectionprocessor/factory.go | 10 +-- .../factory_test.go | 2 +- processor/resourcedetectionprocessor/go.mod | 12 +-- processor/resourcedetectionprocessor/go.sum | 24 ++--- processor/resourceprocessor/config.go | 2 +- processor/resourceprocessor/config_test.go | 4 +- processor/resourceprocessor/factory.go | 8 +- processor/resourceprocessor/go.mod | 10 +-- processor/resourceprocessor/go.sum | 20 ++--- processor/routingprocessor/config_test.go | 6 +- processor/routingprocessor/factory.go | 8 +- processor/routingprocessor/factory_test.go | 2 +- processor/routingprocessor/go.mod | 12 +-- processor/routingprocessor/go.sum | 24 ++--- processor/routingprocessor/logs.go | 2 +- processor/routingprocessor/metrics.go | 2 +- processor/routingprocessor/router.go | 2 +- processor/routingprocessor/traces.go | 2 +- processor/schemaprocessor/config_test.go | 2 +- processor/schemaprocessor/factory.go | 8 +- processor/schemaprocessor/go.mod | 10 +-- processor/schemaprocessor/go.sum | 20 ++--- processor/schemaprocessor/transformer.go | 2 +- processor/servicegraphprocessor/factory.go | 4 +- processor/servicegraphprocessor/go.mod | 16 ++-- processor/servicegraphprocessor/go.sum | 32 +++---- processor/servicegraphprocessor/processor.go | 2 +- processor/spanmetricsprocessor/factory.go | 4 +- processor/spanmetricsprocessor/go.mod | 18 ++-- processor/spanmetricsprocessor/go.sum | 36 ++++---- processor/spanmetricsprocessor/processor.go | 2 +- processor/spanprocessor/config.go | 2 +- processor/spanprocessor/config_test.go | 4 +- processor/spanprocessor/factory.go | 4 +- processor/spanprocessor/go.mod | 12 +-- processor/spanprocessor/go.sum | 24 ++--- .../tailsamplingprocessor/config_test.go | 2 +- processor/tailsamplingprocessor/factory.go | 4 +- .../tailsamplingprocessor/factory_test.go | 2 +- processor/tailsamplingprocessor/go.mod | 10 +-- processor/tailsamplingprocessor/go.sum | 20 ++--- processor/transformprocessor/config.go | 2 +- processor/transformprocessor/config_test.go | 6 +- processor/transformprocessor/factory.go | 8 +- processor/transformprocessor/go.mod | 10 +-- processor/transformprocessor/go.sum | 20 ++--- .../activedirectorydsreceiver/config_test.go | 4 +- receiver/activedirectorydsreceiver/factory.go | 2 +- .../factory_others.go | 2 +- .../factory_windows.go | 2 +- receiver/activedirectorydsreceiver/go.mod | 10 +-- receiver/activedirectorydsreceiver/go.sum | 20 ++--- receiver/aerospikereceiver/config_test.go | 2 +- receiver/aerospikereceiver/factory.go | 4 +- receiver/aerospikereceiver/go.mod | 10 +-- receiver/aerospikereceiver/go.sum | 20 ++--- receiver/apachereceiver/config_test.go | 2 +- receiver/apachereceiver/factory.go | 4 +- receiver/apachereceiver/go.mod | 10 +-- receiver/apachereceiver/go.sum | 20 ++--- receiver/awscloudwatchreceiver/config_test.go | 4 +- receiver/awscloudwatchreceiver/factory.go | 4 +- receiver/awscloudwatchreceiver/go.mod | 10 +-- receiver/awscloudwatchreceiver/go.sum | 20 ++--- .../config_test.go | 4 +- .../awscontainerinsightreceiver/factory.go | 4 +- receiver/awscontainerinsightreceiver/go.mod | 10 +-- receiver/awscontainerinsightreceiver/go.sum | 20 ++--- .../config_test.go | 4 +- .../awsecscontainermetricsreceiver/factory.go | 4 +- .../awsecscontainermetricsreceiver/go.mod | 12 +-- .../awsecscontainermetricsreceiver/go.sum | 24 ++--- receiver/awsfirehosereceiver/config_test.go | 2 +- receiver/awsfirehosereceiver/factory.go | 4 +- receiver/awsfirehosereceiver/go.mod | 12 +-- receiver/awsfirehosereceiver/go.sum | 24 ++--- receiver/awsxrayreceiver/config_test.go | 4 +- receiver/awsxrayreceiver/factory.go | 4 +- receiver/awsxrayreceiver/go.mod | 12 +-- receiver/awsxrayreceiver/go.sum | 24 ++--- receiver/azureblobreceiver/factory.go | 10 +-- receiver/azureblobreceiver/factory_test.go | 2 +- receiver/azureblobreceiver/go.mod | 14 +-- receiver/azureblobreceiver/go.sum | 28 +++--- receiver/azureeventhubreceiver/factory.go | 4 +- receiver/azureeventhubreceiver/go.mod | 14 +-- receiver/azureeventhubreceiver/go.sum | 28 +++--- receiver/bigipreceiver/config_test.go | 2 +- receiver/bigipreceiver/factory.go | 4 +- receiver/bigipreceiver/factory_test.go | 2 +- receiver/bigipreceiver/go.mod | 10 +-- receiver/bigipreceiver/go.sum | 20 ++--- receiver/carbonreceiver/config_test.go | 4 +- receiver/carbonreceiver/factory.go | 4 +- receiver/carbonreceiver/go.mod | 12 +-- receiver/carbonreceiver/go.sum | 24 ++--- receiver/chronyreceiver/config.go | 4 +- receiver/chronyreceiver/config_test.go | 2 +- receiver/chronyreceiver/factory.go | 2 +- receiver/chronyreceiver/go.mod | 10 +-- receiver/chronyreceiver/go.sum | 20 ++--- receiver/cloudfoundryreceiver/config_test.go | 4 +- receiver/cloudfoundryreceiver/factory.go | 4 +- receiver/cloudfoundryreceiver/go.mod | 10 +-- receiver/cloudfoundryreceiver/go.sum | 20 ++--- receiver/collectdreceiver/config_test.go | 4 +- receiver/collectdreceiver/factory.go | 4 +- receiver/collectdreceiver/go.mod | 12 +-- receiver/collectdreceiver/go.sum | 24 ++--- receiver/couchdbreceiver/config_test.go | 2 +- receiver/couchdbreceiver/factory.go | 4 +- receiver/couchdbreceiver/go.mod | 10 +-- receiver/couchdbreceiver/go.sum | 20 ++--- receiver/dockerstatsreceiver/config.go | 2 +- receiver/dockerstatsreceiver/config_test.go | 4 +- receiver/dockerstatsreceiver/factory.go | 4 +- receiver/dockerstatsreceiver/go.mod | 12 +-- receiver/dockerstatsreceiver/go.sum | 24 ++--- .../dotnetdiagnosticsreceiver/config_test.go | 2 +- receiver/dotnetdiagnosticsreceiver/factory.go | 4 +- receiver/dotnetdiagnosticsreceiver/go.mod | 10 +-- receiver/dotnetdiagnosticsreceiver/go.sum | 20 ++--- receiver/elasticsearchreceiver/config_test.go | 4 +- receiver/elasticsearchreceiver/factory.go | 4 +- receiver/elasticsearchreceiver/go.mod | 10 +-- receiver/elasticsearchreceiver/go.sum | 20 ++--- receiver/expvarreceiver/config.go | 2 +- receiver/expvarreceiver/config_test.go | 4 +- receiver/expvarreceiver/factory.go | 4 +- receiver/expvarreceiver/go.mod | 10 +-- receiver/expvarreceiver/go.sum | 20 ++--- receiver/filelogreceiver/filelog.go | 6 +- receiver/filelogreceiver/filelog_test.go | 2 +- receiver/filelogreceiver/go.mod | 10 +-- receiver/filelogreceiver/go.sum | 20 ++--- receiver/flinkmetricsreceiver/config_test.go | 2 +- receiver/flinkmetricsreceiver/factory.go | 4 +- receiver/flinkmetricsreceiver/factory_test.go | 2 +- receiver/flinkmetricsreceiver/go.mod | 10 +-- receiver/flinkmetricsreceiver/go.sum | 20 ++--- receiver/fluentforwardreceiver/config_test.go | 2 +- receiver/fluentforwardreceiver/factory.go | 4 +- receiver/fluentforwardreceiver/go.mod | 10 +-- receiver/fluentforwardreceiver/go.sum | 20 ++--- .../googlecloudpubsubreceiver/config_test.go | 4 +- receiver/googlecloudpubsubreceiver/factory.go | 10 +-- receiver/googlecloudpubsubreceiver/go.mod | 10 +-- receiver/googlecloudpubsubreceiver/go.sum | 20 ++--- .../googlecloudspannerreceiver/config_test.go | 2 +- .../googlecloudspannerreceiver/factory.go | 4 +- receiver/googlecloudspannerreceiver/go.mod | 10 +-- receiver/googlecloudspannerreceiver/go.sum | 20 ++--- receiver/hostmetricsreceiver/config.go | 2 +- receiver/hostmetricsreceiver/factory.go | 4 +- receiver/hostmetricsreceiver/go.mod | 14 +-- receiver/hostmetricsreceiver/go.sum | 28 +++--- receiver/httpcheckreceiver/factory.go | 4 +- receiver/httpcheckreceiver/factory_test.go | 2 +- receiver/httpcheckreceiver/go.mod | 10 +-- receiver/httpcheckreceiver/go.sum | 20 ++--- receiver/iisreceiver/factory.go | 2 +- receiver/iisreceiver/factory_others.go | 2 +- receiver/iisreceiver/factory_test.go | 2 +- receiver/iisreceiver/factory_windows.go | 2 +- receiver/iisreceiver/go.mod | 10 +-- receiver/iisreceiver/go.sum | 20 ++--- receiver/influxdbreceiver/factory.go | 4 +- receiver/influxdbreceiver/go.mod | 10 +-- receiver/influxdbreceiver/go.sum | 20 ++--- receiver/jaegerreceiver/config.go | 2 +- receiver/jaegerreceiver/config_test.go | 10 +-- receiver/jaegerreceiver/factory.go | 4 +- receiver/jaegerreceiver/factory_test.go | 2 +- receiver/jaegerreceiver/go.mod | 12 +-- receiver/jaegerreceiver/go.sum | 24 ++--- receiver/jmxreceiver/config_test.go | 6 +- receiver/jmxreceiver/factory.go | 4 +- receiver/jmxreceiver/go.mod | 12 +-- receiver/jmxreceiver/go.sum | 24 ++--- receiver/journaldreceiver/go.mod | 10 +-- receiver/journaldreceiver/go.sum | 20 ++--- receiver/journaldreceiver/journald.go | 6 +- .../journaldreceiver/journald_nonlinux.go | 4 +- receiver/journaldreceiver/journald_test.go | 2 +- receiver/k8sclusterreceiver/config.go | 2 +- receiver/k8sclusterreceiver/config_test.go | 5 +- receiver/k8sclusterreceiver/factory.go | 2 +- receiver/k8sclusterreceiver/go.mod | 12 +-- receiver/k8sclusterreceiver/go.sum | 24 ++--- receiver/k8sclusterreceiver/receiver.go | 2 +- receiver/k8seventsreceiver/config_test.go | 4 +- receiver/k8seventsreceiver/factory.go | 4 +- receiver/k8seventsreceiver/go.mod | 12 +-- receiver/k8seventsreceiver/go.sum | 24 ++--- receiver/k8sobjectsreceiver/config_test.go | 4 +- receiver/k8sobjectsreceiver/factory.go | 4 +- receiver/k8sobjectsreceiver/go.mod | 12 +-- receiver/k8sobjectsreceiver/go.sum | 24 ++--- receiver/kafkametricsreceiver/config_test.go | 2 +- receiver/kafkametricsreceiver/factory.go | 4 +- receiver/kafkametricsreceiver/go.mod | 12 +-- receiver/kafkametricsreceiver/go.sum | 24 ++--- receiver/kafkareceiver/config.go | 2 +- receiver/kafkareceiver/config_test.go | 4 +- receiver/kafkareceiver/factory.go | 8 +- receiver/kafkareceiver/go.mod | 12 +-- receiver/kafkareceiver/go.sum | 24 ++--- receiver/kubeletstatsreceiver/config.go | 11 +-- receiver/kubeletstatsreceiver/config_test.go | 4 +- receiver/kubeletstatsreceiver/factory.go | 4 +- receiver/kubeletstatsreceiver/go.mod | 12 +-- receiver/kubeletstatsreceiver/go.sum | 24 ++--- receiver/memcachedreceiver/config_test.go | 2 +- receiver/memcachedreceiver/factory.go | 4 +- receiver/memcachedreceiver/go.mod | 10 +-- receiver/memcachedreceiver/go.sum | 20 ++--- receiver/mongodbatlasreceiver/config.go | 2 +- receiver/mongodbatlasreceiver/factory.go | 6 +- receiver/mongodbatlasreceiver/go.mod | 10 +-- receiver/mongodbatlasreceiver/go.sum | 20 ++--- receiver/mongodbreceiver/config_test.go | 2 +- receiver/mongodbreceiver/factory.go | 4 +- receiver/mongodbreceiver/go.mod | 10 +-- receiver/mongodbreceiver/go.sum | 20 ++--- receiver/mysqlreceiver/config_test.go | 2 +- receiver/mysqlreceiver/factory.go | 4 +- receiver/mysqlreceiver/go.mod | 10 +-- receiver/mysqlreceiver/go.sum | 20 ++--- receiver/nginxreceiver/config_test.go | 2 +- receiver/nginxreceiver/factory.go | 4 +- receiver/nginxreceiver/go.mod | 10 +-- receiver/nginxreceiver/go.sum | 20 ++--- receiver/nsxtreceiver/config_test.go | 2 +- receiver/nsxtreceiver/factory.go | 4 +- receiver/nsxtreceiver/go.mod | 10 +-- receiver/nsxtreceiver/go.sum | 20 ++--- receiver/opencensusreceiver/config.go | 2 +- receiver/opencensusreceiver/config_test.go | 4 +- receiver/opencensusreceiver/factory.go | 6 +- receiver/opencensusreceiver/go.mod | 12 +-- receiver/opencensusreceiver/go.sum | 24 ++--- receiver/oracledbreceiver/factory.go | 4 +- receiver/oracledbreceiver/go.mod | 10 +-- receiver/oracledbreceiver/go.sum | 20 ++--- receiver/otlpjsonfilereceiver/file.go | 8 +- receiver/otlpjsonfilereceiver/file_test.go | 2 +- receiver/otlpjsonfilereceiver/go.mod | 10 +-- receiver/otlpjsonfilereceiver/go.sum | 20 ++--- receiver/podmanreceiver/config.go | 2 +- receiver/podmanreceiver/config_test.go | 4 +- receiver/podmanreceiver/factory.go | 4 +- receiver/podmanreceiver/go.mod | 12 +-- receiver/podmanreceiver/go.sum | 24 ++--- receiver/postgresqlreceiver/config_test.go | 4 +- receiver/postgresqlreceiver/factory.go | 4 +- receiver/postgresqlreceiver/go.mod | 10 +-- receiver/postgresqlreceiver/go.sum | 20 ++--- .../prometheusexecreceiver/config_test.go | 4 +- receiver/prometheusexecreceiver/factory.go | 4 +- .../prometheusexecreceiver/factory_test.go | 4 +- receiver/prometheusexecreceiver/go.mod | 12 +-- receiver/prometheusexecreceiver/go.sum | 26 +++--- .../prometheusexecreceiver/receiver_test.go | 8 +- receiver/prometheusreceiver/config.go | 2 +- receiver/prometheusreceiver/config_test.go | 34 +++---- receiver/prometheusreceiver/factory.go | 4 +- receiver/prometheusreceiver/factory_test.go | 2 +- receiver/prometheusreceiver/go.mod | 14 +-- receiver/prometheusreceiver/go.sum | 28 +++--- receiver/pulsarreceiver/config.go | 2 +- receiver/pulsarreceiver/config_test.go | 2 +- receiver/pulsarreceiver/factory.go | 8 +- receiver/pulsarreceiver/go.mod | 12 +-- receiver/pulsarreceiver/go.sum | 24 ++--- receiver/purefareceiver/config.go | 2 +- receiver/purefareceiver/config_test.go | 4 +- receiver/purefareceiver/factory.go | 2 +- receiver/purefareceiver/go.mod | 10 +-- receiver/purefareceiver/go.sum | 20 ++--- receiver/purefareceiver/receiver.go | 2 +- receiver/rabbitmqreceiver/config_test.go | 2 +- receiver/rabbitmqreceiver/factory.go | 4 +- receiver/rabbitmqreceiver/factory_test.go | 2 +- receiver/rabbitmqreceiver/go.mod | 10 +-- receiver/rabbitmqreceiver/go.sum | 20 ++--- receiver/receivercreator/config_test.go | 8 +- receiver/receivercreator/factory.go | 4 +- receiver/receivercreator/go.mod | 14 +-- receiver/receivercreator/go.sum | 28 +++--- receiver/receivercreator/receiver_test.go | 2 +- receiver/receivercreator/runner.go | 6 +- receiver/redisreceiver/config_test.go | 2 +- receiver/redisreceiver/factory.go | 4 +- receiver/redisreceiver/go.mod | 10 +-- receiver/redisreceiver/go.sum | 20 ++--- receiver/riakreceiver/factory.go | 4 +- receiver/riakreceiver/factory_test.go | 2 +- receiver/riakreceiver/go.mod | 10 +-- receiver/riakreceiver/go.sum | 20 ++--- receiver/saphanareceiver/config_test.go | 2 +- receiver/saphanareceiver/factory.go | 4 +- receiver/saphanareceiver/go.mod | 10 +-- receiver/saphanareceiver/go.sum | 20 ++--- receiver/sapmreceiver/config_test.go | 4 +- receiver/sapmreceiver/factory.go | 4 +- receiver/sapmreceiver/go.mod | 12 +-- receiver/sapmreceiver/go.sum | 24 ++--- receiver/signalfxreceiver/config_test.go | 4 +- receiver/signalfxreceiver/factory.go | 6 +- receiver/signalfxreceiver/go.mod | 12 +-- receiver/signalfxreceiver/go.sum | 24 ++--- .../simpleprometheusreceiver/config_test.go | 4 +- receiver/simpleprometheusreceiver/factory.go | 4 +- receiver/simpleprometheusreceiver/go.mod | 12 +-- receiver/simpleprometheusreceiver/go.sum | 26 +++--- receiver/skywalkingreceiver/config.go | 2 +- receiver/skywalkingreceiver/config_test.go | 4 +- receiver/skywalkingreceiver/factory.go | 4 +- receiver/skywalkingreceiver/factory_test.go | 2 +- receiver/skywalkingreceiver/go.mod | 12 +-- receiver/skywalkingreceiver/go.sum | 24 ++--- receiver/snmpreceiver/config_test.go | 4 +- receiver/snmpreceiver/factory.go | 4 +- receiver/snmpreceiver/factory_test.go | 2 +- receiver/snmpreceiver/go.mod | 14 +-- receiver/snmpreceiver/go.sum | 28 +++--- receiver/solacereceiver/config_test.go | 4 +- receiver/solacereceiver/factory.go | 4 +- receiver/solacereceiver/factory_test.go | 4 +- receiver/solacereceiver/go.mod | 10 +-- receiver/solacereceiver/go.sum | 20 ++--- receiver/splunkhecreceiver/config_test.go | 4 +- receiver/splunkhecreceiver/factory.go | 6 +- receiver/splunkhecreceiver/go.mod | 12 +-- receiver/splunkhecreceiver/go.sum | 24 ++--- receiver/sqlqueryreceiver/config.go | 2 +- receiver/sqlqueryreceiver/config_test.go | 6 +- receiver/sqlqueryreceiver/go.mod | 10 +-- receiver/sqlqueryreceiver/go.sum | 20 ++--- receiver/sqlqueryreceiver/receiver.go | 2 +- receiver/sqlserverreceiver/config_test.go | 2 +- receiver/sqlserverreceiver/factory.go | 2 +- receiver/sqlserverreceiver/factory_others.go | 2 +- receiver/sqlserverreceiver/factory_test.go | 2 +- receiver/sqlserverreceiver/factory_windows.go | 2 +- receiver/sqlserverreceiver/go.mod | 10 +-- receiver/sqlserverreceiver/go.sum | 20 ++--- receiver/statsdreceiver/config_test.go | 4 +- receiver/statsdreceiver/factory.go | 4 +- receiver/statsdreceiver/go.mod | 10 +-- receiver/statsdreceiver/go.sum | 22 ++--- receiver/syslogreceiver/go.mod | 10 +-- receiver/syslogreceiver/go.sum | 20 ++--- receiver/syslogreceiver/syslog.go | 6 +- receiver/syslogreceiver/syslog_test.go | 2 +- receiver/tcplogreceiver/go.mod | 10 +-- receiver/tcplogreceiver/go.sum | 20 ++--- receiver/tcplogreceiver/tcp.go | 6 +- receiver/tcplogreceiver/tcp_test.go | 2 +- receiver/udplogreceiver/go.mod | 10 +-- receiver/udplogreceiver/go.sum | 20 ++--- receiver/udplogreceiver/udp.go | 6 +- receiver/udplogreceiver/udp_test.go | 2 +- receiver/vcenterreceiver/config_test.go | 2 +- receiver/vcenterreceiver/factory.go | 4 +- receiver/vcenterreceiver/go.mod | 10 +-- receiver/vcenterreceiver/go.sum | 20 ++--- receiver/wavefrontreceiver/config_test.go | 4 +- receiver/wavefrontreceiver/factory.go | 4 +- receiver/wavefrontreceiver/go.mod | 12 +-- receiver/wavefrontreceiver/go.sum | 24 ++--- receiver/windowseventlogreceiver/go.mod | 10 +-- receiver/windowseventlogreceiver/go.sum | 20 ++--- .../receiver_others.go | 4 +- .../receiver_windows.go | 6 +- .../receiver_windows_test.go | 2 +- .../config_test.go | 4 +- .../windowsperfcountersreceiver/factory.go | 2 +- .../factory_others.go | 2 +- .../factory_windows.go | 2 +- receiver/windowsperfcountersreceiver/go.mod | 10 +-- receiver/windowsperfcountersreceiver/go.sum | 20 ++--- receiver/zipkinreceiver/config.go | 2 +- receiver/zipkinreceiver/config_test.go | 4 +- receiver/zipkinreceiver/factory.go | 4 +- receiver/zipkinreceiver/go.mod | 12 +-- receiver/zipkinreceiver/go.sum | 24 ++--- receiver/zookeeperreceiver/factory.go | 4 +- receiver/zookeeperreceiver/factory_test.go | 2 +- receiver/zookeeperreceiver/go.mod | 10 +-- receiver/zookeeperreceiver/go.sum | 20 ++--- testbed/go.mod | 28 +++--- testbed/go.sum | 56 ++++++------ .../mockawsxrayreceiver/factory.go | 4 +- .../mockawsxrayreceiver/go.mod | 10 +-- .../mockawsxrayreceiver/go.sum | 20 ++--- 809 files changed, 3977 insertions(+), 3988 deletions(-) diff --git a/.github/workflows/scripts/check-collector-module-version.sh b/.github/workflows/scripts/check-collector-module-version.sh index 277f20fe4678..ceb8fdf2084c 100755 --- a/.github/workflows/scripts/check-collector-module-version.sh +++ b/.github/workflows/scripts/check-collector-module-version.sh @@ -73,12 +73,13 @@ check_collector_versions_correct() { # only and does not return string which contains this string as a substring. COLLECTOR_MODULE="go.opentelemetry.io/collector " -COLLECTOR_MODEL_PDATA="go.opentelemetry.io/collector/pdata" -COLLECTOR_MODEL_SEMCONV="go.opentelemetry.io/collector/semconv" MAIN_MOD_FILE="./go.mod" COLLECTOR_MOD_VERSION=$(get_collector_version "$COLLECTOR_MODULE" "$MAIN_MOD_FILE") # Check the collector module version in each of the module files check_collector_versions_correct "$COLLECTOR_MODULE" "$COLLECTOR_MOD_VERSION" -check_collector_versions_correct "$COLLECTOR_MODEL_PDATA" "$COLLECTOR_MOD_VERSION" -check_collector_versions_correct "$COLLECTOR_MODEL_SEMCONV" "$COLLECTOR_MOD_VERSION" +check_collector_versions_correct "go.opentelemetry.io/collector/component" "$COLLECTOR_MOD_VERSION" +check_collector_versions_correct "go.opentelemetry.io/collector/consumer" "$COLLECTOR_MOD_VERSION" +check_collector_versions_correct "go.opentelemetry.io/collector/featuregate" "$COLLECTOR_MOD_VERSION" +check_collector_versions_correct "go.opentelemetry.io/collector/pdata" "$COLLECTOR_MOD_VERSION" +check_collector_versions_correct "go.opentelemetry.io/collector/semconv" "$COLLECTOR_MOD_VERSION" diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 8edca24ec41b..dbab00e030a4 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -8,9 +8,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 golang.org/x/mod v0.6.0 golang.org/x/text v0.4.0 ) @@ -582,17 +582,17 @@ require ( go.mongodb.org/atlas v0.19.0 // indirect go.mongodb.org/mongo-driver v1.10.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/exporter/loggingexporter v0.66.0 // indirect - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0 // indirect - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.0 // indirect - go.opentelemetry.io/collector/extension/ballastextension v0.66.0 // indirect - go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 // indirect - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/zpages v0.36.4 // indirect diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index f322190753b5..e180fea8bcfb 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -2347,50 +2347,50 @@ go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.64.1/go.mod h1:RxdEKzwxTEhBAgzC4wzyJEwSFgjWU73CHnLjKUKQDyo= go.opentelemetry.io/collector v0.65.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= go.opentelemetry.io/collector/component v0.65.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= go.opentelemetry.io/collector/consumer v0.65.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.0 h1:LLgWAS3zGce/H7UVB/EwPm49n3qNRbh/Gkd1IPORJDg= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.0/go.mod h1:X7fNHTbcgvOOio9QDEyVk0WbIm1JaVYby4z3VzsOc2k= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0 h1:uXNkGlAXHyvUZL51qsQR8hS8oSt80m1ncbqwXRRkJMk= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.0 h1:Nqopv2VdkjI/kCg8SsZYBD5R+Gd3OlM5lAZ2N+Exx60= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.0/go.mod h1:Gx9WIGE9pUv38Sm8IN0IPM7k+mX2hHGfRZI/65pOSIc= -go.opentelemetry.io/collector/extension/ballastextension v0.66.0 h1:oAEb4UBwNs5v9X83farWSVnxmjSiU5eHmWCU6agSVRE= -go.opentelemetry.io/collector/extension/ballastextension v0.66.0/go.mod h1:vjBno34PZB+byrW3QWzftLFqCI1G8PbgPrgPzpFXpQM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:kCxEnurhKpScV+wDU/7RDngmOFeqyEh7GZUqrBaYnUU= +go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:X7fNHTbcgvOOio9QDEyVk0WbIm1JaVYby4z3VzsOc2k= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:3+YgPEDEyNzwiI+V9J2YBVGyV9Qppu4VPbB3jHeN8Ns= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:KkI/to7/yvuL5zHzhviy7UXMZVZ7jbfnk+YCAwCiimA= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:Gx9WIGE9pUv38Sm8IN0IPM7k+mX2hHGfRZI/65pOSIc= +go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90 h1:JmfSDExgWNiFQJ4eF9UzjDaE9rfBhKxIu5khBbAScd0= +go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:vjBno34PZB+byrW3QWzftLFqCI1G8PbgPrgPzpFXpQM= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1/go.mod h1:XenhQAUbOHgqNq5YQ/vQIcDHRcPUaDgZQxDC2qoI4Bc= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90 h1:Hsvd2zNTCjHjYVsHt57zUgpKMrmESgndZItuuvvv2bA= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.64.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= go.opentelemetry.io/collector/pdata v0.65.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/collector/processor/batchprocessor v0.64.1/go.mod h1:qVl0+aYokPfiq5y+JVAvlII2rrUFBDEqqiDbTSnax78= go.opentelemetry.io/collector/processor/batchprocessor v0.65.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.0 h1:JLzuWcVrRGFyLUaE9u42ZdLNXNUpbLnEQg3w0ULeQG8= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.0/go.mod h1:KfHfOzND4tzQYewrYzi/NGzvOV3wR7jzWTkxSR00lRI= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:4+4M7itvIDswjFTjvVttC+XWy7eOU2lxjEBaUiq/MXk= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:KfHfOzND4tzQYewrYzi/NGzvOV3wR7jzWTkxSR00lRI= go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.1/go.mod h1:4rwNi9SeCKBP9XGLWNRFKPsWUV5NK4iqMvdj2WRMksQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0 h1:ZHEOeGOIYIDTKhI9xs30/obFfhUbb9b2+e/eahp1fJA= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 h1:/+HfaoVPSXgHUZOTZSSriuKOQi8L/rgyb7TTRx5jzoo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.64.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/collector/semconv v0.65.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 491061e86618..b19546b54cdf 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -7,8 +7,8 @@ require ( github.com/go-playground/universal-translator v0.18.0 github.com/go-playground/validator/v10 v10.11.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -26,7 +26,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 // indirect diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index 9c64ebd93ea3..1fd53dd5dd66 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -276,12 +276,12 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= diff --git a/confmap/provider/s3provider/go.mod b/confmap/provider/s3provider/go.mod index b56c5ab1aada..156144ee37b5 100644 --- a/confmap/provider/s3provider/go.mod +++ b/confmap/provider/s3provider/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.19.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 gopkg.in/yaml.v2 v2.4.0 ) @@ -31,7 +31,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/confmap/provider/s3provider/go.sum b/confmap/provider/s3provider/go.sum index 105216f11c64..b27f72452d90 100644 --- a/confmap/provider/s3provider/go.sum +++ b/confmap/provider/s3provider/go.sum @@ -280,10 +280,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/exporter/alibabacloudlogserviceexporter/config_test.go b/exporter/alibabacloudlogserviceexporter/config_test.go index a2413ac2cfd7..7ecf323e649a 100644 --- a/exporter/alibabacloudlogserviceexporter/config_test.go +++ b/exporter/alibabacloudlogserviceexporter/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { @@ -64,7 +64,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/alibabacloudlogserviceexporter/factory.go b/exporter/alibabacloudlogserviceexporter/factory.go index b5da27d6f580..bec53fe21670 100644 --- a/exporter/alibabacloudlogserviceexporter/factory.go +++ b/exporter/alibabacloudlogserviceexporter/factory.go @@ -39,7 +39,7 @@ func NewFactory() component.ExporterFactory { } // CreateDefaultConfig creates the default configuration for exporter. -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), } @@ -48,7 +48,7 @@ func createDefaultConfig() component.ExporterConfig { func createTracesExporter( _ context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.TracesExporter, error) { return newTracesExporter(set, cfg) } @@ -56,7 +56,7 @@ func createTracesExporter( func createMetricsExporter( _ context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (exp component.MetricsExporter, err error) { return newMetricsExporter(set, cfg) } @@ -64,7 +64,7 @@ func createMetricsExporter( func createLogsExporter( _ context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (exp component.LogsExporter, err error) { return newLogsExporter(set, cfg) } diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index 568d5a7fc326..4dfede05c3ab 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -7,10 +7,10 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -33,8 +33,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index a416e81e6065..378f36dba3e9 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -422,18 +422,18 @@ go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/alibabacloudlogserviceexporter/logs_exporter.go b/exporter/alibabacloudlogserviceexporter/logs_exporter.go index a31dcb18011b..9b7e17af25ec 100644 --- a/exporter/alibabacloudlogserviceexporter/logs_exporter.go +++ b/exporter/alibabacloudlogserviceexporter/logs_exporter.go @@ -24,7 +24,7 @@ import ( ) // newLogsExporter return a new LogService logs exporter. -func newLogsExporter(set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.LogsExporter, error) { +func newLogsExporter(set component.ExporterCreateSettings, cfg component.Config) (component.LogsExporter, error) { l := &logServiceLogsSender{ logger: set.Logger, diff --git a/exporter/alibabacloudlogserviceexporter/metrics_exporter.go b/exporter/alibabacloudlogserviceexporter/metrics_exporter.go index 5bd2ad76b4d1..f9ade5535b81 100644 --- a/exporter/alibabacloudlogserviceexporter/metrics_exporter.go +++ b/exporter/alibabacloudlogserviceexporter/metrics_exporter.go @@ -24,7 +24,7 @@ import ( ) // newMetricsExporter return a new LogSerice metrics exporter. -func newMetricsExporter(set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.MetricsExporter, error) { +func newMetricsExporter(set component.ExporterCreateSettings, cfg component.Config) (component.MetricsExporter, error) { l := &logServiceMetricsSender{ logger: set.Logger, diff --git a/exporter/alibabacloudlogserviceexporter/trace_exporter.go b/exporter/alibabacloudlogserviceexporter/trace_exporter.go index 75570fb2de29..45f778d55c6d 100644 --- a/exporter/alibabacloudlogserviceexporter/trace_exporter.go +++ b/exporter/alibabacloudlogserviceexporter/trace_exporter.go @@ -24,7 +24,7 @@ import ( ) // newTracesExporter return a new LogSerice trace exporter. -func newTracesExporter(set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.TracesExporter, error) { +func newTracesExporter(set component.ExporterCreateSettings, cfg component.Config) (component.TracesExporter, error) { l := &logServiceTraceSender{ logger: set.Logger, diff --git a/exporter/awscloudwatchlogsexporter/config.go b/exporter/awscloudwatchlogsexporter/config.go index 0adc8a9f1d55..f16cc495253f 100644 --- a/exporter/awscloudwatchlogsexporter/config.go +++ b/exporter/awscloudwatchlogsexporter/config.go @@ -63,7 +63,7 @@ type QueueSettings struct { QueueSize int `mapstructure:"queue_size"` } -var _ component.ExporterConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate config func (config *Config) Validate() error { diff --git a/exporter/awscloudwatchlogsexporter/config_test.go b/exporter/awscloudwatchlogsexporter/config_test.go index ff232683dee0..74fef8a19f7c 100644 --- a/exporter/awscloudwatchlogsexporter/config_test.go +++ b/exporter/awscloudwatchlogsexporter/config_test.go @@ -39,7 +39,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config errorMessage string }{ { @@ -99,7 +99,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - err = component.UnmarshalExporterConfig(sub, cfg) + err = component.UnmarshalConfig(sub, cfg) if tt.expected == nil { err = multierr.Append(err, component.ValidateConfig(cfg)) diff --git a/exporter/awscloudwatchlogsexporter/exporter.go b/exporter/awscloudwatchlogsexporter/exporter.go index 89073d6b2eb8..50a100d44964 100644 --- a/exporter/awscloudwatchlogsexporter/exporter.go +++ b/exporter/awscloudwatchlogsexporter/exporter.go @@ -78,7 +78,7 @@ func newCwLogsPusher(expConfig *Config, params component.ExporterCreateSettings) return logsExporter, nil } -func newCwLogsExporter(config component.ExporterConfig, params component.ExporterCreateSettings) (component.LogsExporter, error) { +func newCwLogsExporter(config component.Config, params component.ExporterCreateSettings) (component.LogsExporter, error) { expConfig := config.(*Config) logsExporter, err := newCwLogsPusher(expConfig, params) if err != nil { diff --git a/exporter/awscloudwatchlogsexporter/factory.go b/exporter/awscloudwatchlogsexporter/factory.go index 9622f4076a34..bb3e7f7e4a62 100644 --- a/exporter/awscloudwatchlogsexporter/factory.go +++ b/exporter/awscloudwatchlogsexporter/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ExporterFactory { component.WithLogsExporter(createLogsExporter, stability)) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.NewDefaultRetrySettings(), @@ -51,7 +51,7 @@ func createDefaultConfig() component.ExporterConfig { } } -func createLogsExporter(_ context.Context, params component.ExporterCreateSettings, config component.ExporterConfig) (component.LogsExporter, error) { +func createLogsExporter(_ context.Context, params component.ExporterCreateSettings, config component.Config) (component.LogsExporter, error) { expConfig, ok := config.(*Config) if !ok { return nil, errors.New("invalid configuration type; can't cast to awscloudwatchlogsexporter.Config") diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index 94d4cdfb49cb..8c5c3135bed5 100644 --- a/exporter/awscloudwatchlogsexporter/go.mod +++ b/exporter/awscloudwatchlogsexporter/go.mod @@ -8,10 +8,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -33,7 +33,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum index 10a30c91f5b6..2c3fc7580785 100644 --- a/exporter/awscloudwatchlogsexporter/go.sum +++ b/exporter/awscloudwatchlogsexporter/go.sum @@ -289,16 +289,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/awsemfexporter/config_test.go b/exporter/awsemfexporter/config_test.go index f8a9fef0baab..ef1a44d5cab8 100644 --- a/exporter/awsemfexporter/config_test.go +++ b/exporter/awsemfexporter/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -93,7 +93,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/awsemfexporter/emf_exporter.go b/exporter/awsemfexporter/emf_exporter.go index 9ebc12cb9398..3e526e684122 100644 --- a/exporter/awsemfexporter/emf_exporter.go +++ b/exporter/awsemfexporter/emf_exporter.go @@ -47,7 +47,7 @@ type emfExporter struct { // Each (log group, log stream) keeps a separate pusher because of each (log group, log stream) requires separate stream token. groupStreamToPusherMap map[string]map[string]cwlogs.Pusher svcStructuredLog *cwlogs.Client - config component.ExporterConfig + config component.Config logger *zap.Logger metricTranslator metricTranslator @@ -59,7 +59,7 @@ type emfExporter struct { // newEmfPusher func creates an EMF Exporter instance with data push callback func func newEmfPusher( - config component.ExporterConfig, + config component.Config, params component.ExporterCreateSettings, ) (component.MetricsExporter, error) { if config == nil { @@ -95,7 +95,7 @@ func newEmfPusher( // newEmfExporter creates a new exporter using exporterhelper func newEmfExporter( - config component.ExporterConfig, + config component.Config, set component.ExporterCreateSettings, ) (component.MetricsExporter, error) { exp, err := newEmfPusher(config, set) diff --git a/exporter/awsemfexporter/factory.go b/exporter/awsemfexporter/factory.go index 9a86567bd1be..f7551f19daf5 100644 --- a/exporter/awsemfexporter/factory.go +++ b/exporter/awsemfexporter/factory.go @@ -39,7 +39,7 @@ func NewFactory() component.ExporterFactory { } // CreateDefaultConfig creates the default configuration for exporter. -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AWSSessionSettings: awsutil.CreateDefaultSessionConfig(), @@ -55,7 +55,7 @@ func createDefaultConfig() component.ExporterConfig { // createMetricsExporter creates a metrics exporter based on this config. func createMetricsExporter(_ context.Context, params component.ExporterCreateSettings, - config component.ExporterConfig) (component.MetricsExporter, error) { + config component.Config) (component.MetricsExporter, error) { expCfg := config.(*Config) diff --git a/exporter/awsemfexporter/factory_test.go b/exporter/awsemfexporter/factory_test.go index 4e80dcf46137..20c6bbfb4963 100644 --- a/exporter/awsemfexporter/factory_test.go +++ b/exporter/awsemfexporter/factory_test.go @@ -41,7 +41,7 @@ func TestCreateTracesExporter(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "1").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) ctx := context.Background() exporter, err := factory.CreateTracesExporter(ctx, componenttest.NewNopExporterCreateSettings(), cfg) @@ -57,7 +57,7 @@ func TestCreateMetricsExporter(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "1").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) ctx := context.Background() exporter, err := factory.CreateMetricsExporter(ctx, componenttest.NewNopExporterCreateSettings(), cfg) diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index 8b5770acda23..e9b4abafdb8f 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -13,11 +13,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 ) @@ -40,7 +40,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index fb6d72977950..939befba95d0 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -286,18 +286,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/awskinesisexporter/config.go b/exporter/awskinesisexporter/config.go index f3bd070f0377..e82c53443cc8 100644 --- a/exporter/awskinesisexporter/config.go +++ b/exporter/awskinesisexporter/config.go @@ -48,7 +48,7 @@ type Config struct { MaxRecordSize int `mapstructure:"max_record_size"` } -var _ component.ExporterConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/awskinesisexporter/config_test.go b/exporter/awskinesisexporter/config_test.go index 101fa0d4d73c..7739b42fb2ae 100644 --- a/exporter/awskinesisexporter/config_test.go +++ b/exporter/awskinesisexporter/config_test.go @@ -38,7 +38,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, "default"), @@ -93,7 +93,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/awskinesisexporter/exporter.go b/exporter/awskinesisexporter/exporter.go index b52e11b38dc1..65ee84a3a4c9 100644 --- a/exporter/awskinesisexporter/exporter.go +++ b/exporter/awskinesisexporter/exporter.go @@ -53,7 +53,7 @@ var ( _ component.LogsExporter = (*Exporter)(nil) ) -func createExporter(ctx context.Context, c component.ExporterConfig, log *zap.Logger, opts ...func(opt *options)) (*Exporter, error) { +func createExporter(ctx context.Context, c component.Config, log *zap.Logger, opts ...func(opt *options)) (*Exporter, error) { options := &options{ NewKinesisClient: kinesis.NewFromConfig, } diff --git a/exporter/awskinesisexporter/factory.go b/exporter/awskinesisexporter/factory.go index 6cbeceed3b30..153f9214b8af 100644 --- a/exporter/awskinesisexporter/factory.go +++ b/exporter/awskinesisexporter/factory.go @@ -45,7 +45,7 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), @@ -63,7 +63,7 @@ func createDefaultConfig() component.ExporterConfig { } } -func NewTracesExporter(ctx context.Context, params component.ExporterCreateSettings, conf component.ExporterConfig) (component.TracesExporter, error) { +func NewTracesExporter(ctx context.Context, params component.ExporterCreateSettings, conf component.Config) (component.TracesExporter, error) { exp, err := createExporter(ctx, conf, params.Logger) if err != nil { return nil, err @@ -80,7 +80,7 @@ func NewTracesExporter(ctx context.Context, params component.ExporterCreateSetti ) } -func NewMetricsExporter(ctx context.Context, params component.ExporterCreateSettings, conf component.ExporterConfig) (component.MetricsExporter, error) { +func NewMetricsExporter(ctx context.Context, params component.ExporterCreateSettings, conf component.Config) (component.MetricsExporter, error) { exp, err := createExporter(ctx, conf, params.Logger) if err != nil { return nil, err @@ -97,7 +97,7 @@ func NewMetricsExporter(ctx context.Context, params component.ExporterCreateSett ) } -func NewLogsExporter(ctx context.Context, params component.ExporterCreateSettings, conf component.ExporterConfig) (component.LogsExporter, error) { +func NewLogsExporter(ctx context.Context, params component.ExporterCreateSettings, conf component.Config) (component.LogsExporter, error) { exp, err := createExporter(ctx, conf, params.Logger) if err != nil { return nil, err diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index 220d1b5f8710..06206e4fedeb 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -14,10 +14,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -52,8 +52,8 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index 492a0e51a4bc..02a26fd1a730 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -321,18 +321,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/awsxrayexporter/awsxray.go b/exporter/awsxrayexporter/awsxray.go index 8caffeb89aec..f0e800de455f 100644 --- a/exporter/awsxrayexporter/awsxray.go +++ b/exporter/awsxrayexporter/awsxray.go @@ -37,7 +37,7 @@ const ( // newTracesExporter creates an component.TracesExporter that converts to an X-Ray PutTraceSegments // request and then posts the request to the configured region's X-Ray endpoint. func newTracesExporter( - config component.ExporterConfig, set component.ExporterCreateSettings, cn awsutil.ConnAttr) (component.TracesExporter, error) { + config component.Config, set component.ExporterCreateSettings, cn awsutil.ConnAttr) (component.TracesExporter, error) { typeLog := zap.String("type", string(config.ID().Type())) nameLog := zap.String("name", config.ID().String()) logger := set.Logger @@ -86,7 +86,7 @@ func newTracesExporter( ) } -func extractResourceSpans(config component.ExporterConfig, logger *zap.Logger, td ptrace.Traces) []*string { +func extractResourceSpans(config component.Config, logger *zap.Logger, td ptrace.Traces) []*string { documents := make([]*string, 0, td.SpanCount()) for i := 0; i < td.ResourceSpans().Len(); i++ { rspans := td.ResourceSpans().At(i) diff --git a/exporter/awsxrayexporter/awsxray_test.go b/exporter/awsxrayexporter/awsxray_test.go index efff67f673e9..200798e55aae 100644 --- a/exporter/awsxrayexporter/awsxray_test.go +++ b/exporter/awsxrayexporter/awsxray_test.go @@ -94,7 +94,7 @@ func initializeTracesExporter(t testing.TB) component.TracesExporter { return traceExporter } -func generateConfig(t testing.TB) component.ExporterConfig { +func generateConfig(t testing.TB) component.Config { t.Setenv("AWS_ACCESS_KEY_ID", "AKIASSWVJUY4PZXXXXXX") t.Setenv("AWS_SECRET_ACCESS_KEY", "XYrudg2H87u+ADAAq19Wqx3D41a09RsTXXXXXXXX") t.Setenv("AWS_DEFAULT_REGION", "us-east-1") diff --git a/exporter/awsxrayexporter/config_test.go b/exporter/awsxrayexporter/config_test.go index 881929b1cfd3..7ca6c96dbd12 100644 --- a/exporter/awsxrayexporter/config_test.go +++ b/exporter/awsxrayexporter/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -70,7 +70,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/awsxrayexporter/factory.go b/exporter/awsxrayexporter/factory.go index cb48cd527abd..aa3826a98b51 100644 --- a/exporter/awsxrayexporter/factory.go +++ b/exporter/awsxrayexporter/factory.go @@ -38,7 +38,7 @@ func NewFactory() component.ExporterFactory { component.WithTracesExporter(createTracesExporter, stability)) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), AWSSessionSettings: awsutil.CreateDefaultSessionConfig(), @@ -48,7 +48,7 @@ func createDefaultConfig() component.ExporterConfig { func createTracesExporter( _ context.Context, params component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.TracesExporter, error) { eCfg := cfg.(*Config) return newTracesExporter(eCfg, params, &awsutil.Conn{}) diff --git a/exporter/awsxrayexporter/factory_test.go b/exporter/awsxrayexporter/factory_test.go index 2c1487410357..70274e7820db 100644 --- a/exporter/awsxrayexporter/factory_test.go +++ b/exporter/awsxrayexporter/factory_test.go @@ -58,7 +58,7 @@ func TestCreateTracesExporter(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "customname").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) ctx := context.Background() exporter, err := factory.CreateTracesExporter(ctx, componenttest.NewNopExporterCreateSettings(), cfg) @@ -74,7 +74,7 @@ func TestCreateMetricsExporter(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "customname").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) ctx := context.Background() exporter, err := factory.CreateMetricsExporter(ctx, componenttest.NewNopExporterCreateSettings(), cfg) diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index 9087998b470a..3452130fedd1 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -8,11 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -33,7 +33,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index ac48b8219e5a..ec15337a03df 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -281,18 +281,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/azuredataexplorerexporter/config_test.go b/exporter/azuredataexplorerexporter/config_test.go index 521e7aa18312..b0a3c98772a6 100644 --- a/exporter/azuredataexplorerexporter/config_test.go +++ b/exporter/azuredataexplorerexporter/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config errorMessage string }{ { @@ -68,7 +68,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) diff --git a/exporter/azuredataexplorerexporter/factory.go b/exporter/azuredataexplorerexporter/factory.go index 3ca70cdd6913..7d702b9a9651 100644 --- a/exporter/azuredataexplorerexporter/factory.go +++ b/exporter/azuredataexplorerexporter/factory.go @@ -52,7 +52,7 @@ func NewFactory() component.ExporterFactory { } // Create default configurations -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Database: otelDb, @@ -66,7 +66,7 @@ func createDefaultConfig() component.ExporterConfig { func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - config component.ExporterConfig, + config component.Config, ) (component.MetricsExporter, error) { if config == nil { return nil, errors.New("nil config") @@ -99,7 +99,7 @@ func createMetricsExporter( func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - config component.ExporterConfig, + config component.Config, ) (component.TracesExporter, error) { adxCfg := config.(*Config) setDefaultIngestionType(adxCfg, set.Logger) @@ -129,7 +129,7 @@ func createTracesExporter( func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - config component.ExporterConfig, + config component.Config, ) (exp component.LogsExporter, err error) { adxCfg := config.(*Config) setDefaultIngestionType(adxCfg, set.Logger) diff --git a/exporter/azuredataexplorerexporter/factory_test.go b/exporter/azuredataexplorerexporter/factory_test.go index d2895e30a31e..7b3c5d6e962b 100644 --- a/exporter/azuredataexplorerexporter/factory_test.go +++ b/exporter/azuredataexplorerexporter/factory_test.go @@ -36,7 +36,7 @@ func TestCreateMetricsExporter(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() exporter, err := factory.CreateMetricsExporter(context.Background(), params, cfg) @@ -54,7 +54,7 @@ func TestCreateMetricsExporterWhenIngestEmpty(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "2").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() // Load the #3 which has empty @@ -83,7 +83,7 @@ func TestCreateLogsExporter(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() exporter, err := factory.CreateLogsExporter(context.Background(), params, cfg) @@ -101,7 +101,7 @@ func TestCreateLogsExporterWhenIngestEmpty(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "2").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() // Load the #3 which has empty @@ -122,7 +122,7 @@ func TestCreateTracesExporter(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) @@ -140,7 +140,7 @@ func TestCreateTracesExporterWhenIngestEmpty(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "2").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() // Load the #3 which has empty diff --git a/exporter/azuredataexplorerexporter/go.mod b/exporter/azuredataexplorerexporter/go.mod index d11e3593d08e..5e54caa17e44 100644 --- a/exporter/azuredataexplorerexporter/go.mod +++ b/exporter/azuredataexplorerexporter/go.mod @@ -8,9 +8,9 @@ require ( github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -49,8 +49,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/azuredataexplorerexporter/go.sum b/exporter/azuredataexplorerexporter/go.sum index 0f12505d50d1..48c498a27c32 100644 --- a/exporter/azuredataexplorerexporter/go.sum +++ b/exporter/azuredataexplorerexporter/go.sum @@ -330,16 +330,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/azuremonitorexporter/config_test.go b/exporter/azuremonitorexporter/config_test.go index 8f9cbc96c9bb..79cac7362f73 100644 --- a/exporter/azuremonitorexporter/config_test.go +++ b/exporter/azuremonitorexporter/config_test.go @@ -34,7 +34,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { @@ -61,7 +61,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/azuremonitorexporter/factory.go b/exporter/azuremonitorexporter/factory.go index 49b7f16e1ba9..09ab5ce79ddc 100644 --- a/exporter/azuremonitorexporter/factory.go +++ b/exporter/azuremonitorexporter/factory.go @@ -52,7 +52,7 @@ type factory struct { tChannel transportChannel } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: defaultEndpoint, @@ -65,7 +65,7 @@ func createDefaultConfig() component.ExporterConfig { func (f *factory) createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.TracesExporter, error) { exporterConfig, ok := cfg.(*Config) @@ -80,7 +80,7 @@ func (f *factory) createTracesExporter( func (f *factory) createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.LogsExporter, error) { exporterConfig, ok := cfg.(*Config) diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index aa8e03b0343e..4a108466fc36 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -6,11 +6,11 @@ require ( github.com/microsoft/ApplicationInsights-Go v0.4.4 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 golang.org/x/net v0.0.0-20220722155237-a158d28d115b ) @@ -34,7 +34,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index 46c2bca8e083..606bc7ed9212 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -290,18 +290,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/carbonexporter/config_test.go b/exporter/carbonexporter/config_test.go index 107dc9d1ce87..844fe202934c 100644 --- a/exporter/carbonexporter/config_test.go +++ b/exporter/carbonexporter/config_test.go @@ -34,7 +34,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config errorMessage string }{ @@ -59,7 +59,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/carbonexporter/factory.go b/exporter/carbonexporter/factory.go index 1d79dd0eb7b3..459a2f6403bd 100644 --- a/exporter/carbonexporter/factory.go +++ b/exporter/carbonexporter/factory.go @@ -36,7 +36,7 @@ func NewFactory() component.ExporterFactory { component.WithMetricsExporter(createMetricsExporter, stability)) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Endpoint: DefaultEndpoint, @@ -47,7 +47,7 @@ func createDefaultConfig() component.ExporterConfig { func createMetricsExporter( _ context.Context, params component.ExporterCreateSettings, - config component.ExporterConfig, + config component.Config, ) (component.MetricsExporter, error) { exp, err := newCarbonExporter(config.(*Config), params) diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index 0811e63c4355..b406502c5aa1 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -5,10 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 ) @@ -28,8 +28,8 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index c1652265d31b..40852464c97e 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -273,18 +273,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/clickhouseexporter/config_test.go b/exporter/clickhouseexporter/config_test.go index bc5cbb868a6a..797fd4cf95b4 100644 --- a/exporter/clickhouseexporter/config_test.go +++ b/exporter/clickhouseexporter/config_test.go @@ -40,7 +40,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { @@ -78,7 +78,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/clickhouseexporter/factory.go b/exporter/clickhouseexporter/factory.go index cb038f37154e..9b9c8c85dae0 100644 --- a/exporter/clickhouseexporter/factory.go +++ b/exporter/clickhouseexporter/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), @@ -57,7 +57,7 @@ func createDefaultConfig() component.ExporterConfig { func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.LogsExporter, error) { c := cfg.(*Config) exporter, err := newLogsExporter(set.Logger, c) @@ -82,7 +82,7 @@ func createLogsExporter( func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.TracesExporter, error) { c := cfg.(*Config) exporter, err := newTracesExporter(set.Logger, c) diff --git a/exporter/clickhouseexporter/go.mod b/exporter/clickhouseexporter/go.mod index 71c3e4fc54f9..afab7660f33d 100644 --- a/exporter/clickhouseexporter/go.mod +++ b/exporter/clickhouseexporter/go.mod @@ -6,10 +6,10 @@ require ( github.com/ClickHouse/clickhouse-go/v2 v2.3.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -42,8 +42,8 @@ require ( github.com/segmentio/asm v1.2.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/clickhouseexporter/go.sum b/exporter/clickhouseexporter/go.sum index 4b98fb6eb116..e191bbd8339d 100644 --- a/exporter/clickhouseexporter/go.sum +++ b/exporter/clickhouseexporter/go.sum @@ -299,18 +299,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/coralogixexporter/config_test.go b/exporter/coralogixexporter/config_test.go index 592244f3986a..33cb64e1f214 100644 --- a/exporter/coralogixexporter/config_test.go +++ b/exporter/coralogixexporter/config_test.go @@ -39,7 +39,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -164,7 +164,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) @@ -180,7 +180,7 @@ func TestTraceExporter(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() te, err := newTracesExporter(cfg, params) @@ -197,7 +197,7 @@ func TestJaegerBasedTraceExporter(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "trace").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() te, err := newCoralogixExporter(cfg.(*Config), params) diff --git a/exporter/coralogixexporter/factory.go b/exporter/coralogixexporter/factory.go index 40b4081ade18..b14d5932c53d 100644 --- a/exporter/coralogixexporter/factory.go +++ b/exporter/coralogixexporter/factory.go @@ -36,7 +36,7 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -63,7 +63,7 @@ func createDefaultConfig() component.ExporterConfig { } } -func createTraceExporter(ctx context.Context, set component.ExporterCreateSettings, config component.ExporterConfig) (component.TracesExporter, error) { +func createTraceExporter(ctx context.Context, set component.ExporterCreateSettings, config component.Config) (component.TracesExporter, error) { cfg := config.(*Config) // Use deprecated jaeger endpoint if it's not empty @@ -109,7 +109,7 @@ func createTraceExporter(ctx context.Context, set component.ExporterCreateSettin func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.MetricsExporter, error) { oce, err := newMetricsExporter(cfg, set) if err != nil { @@ -133,7 +133,7 @@ func createMetricsExporter( func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.LogsExporter, error) { oce, err := newLogsExporter(cfg, set) if err != nil { diff --git a/exporter/coralogixexporter/go.mod b/exporter/coralogixexporter/go.mod index 5c298616ab5c..ba55695e949a 100644 --- a/exporter/coralogixexporter/go.mod +++ b/exporter/coralogixexporter/go.mod @@ -7,10 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c google.golang.org/grpc v1.51.0 @@ -43,8 +43,8 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/coralogixexporter/go.sum b/exporter/coralogixexporter/go.sum index cc0ffa25bf6b..8418449ab156 100644 --- a/exporter/coralogixexporter/go.sum +++ b/exporter/coralogixexporter/go.sum @@ -315,18 +315,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/coralogixexporter/logs_client.go b/exporter/coralogixexporter/logs_client.go index b80d6ecb36cb..8c15ecdbc1f9 100644 --- a/exporter/coralogixexporter/logs_client.go +++ b/exporter/coralogixexporter/logs_client.go @@ -27,7 +27,7 @@ import ( "google.golang.org/grpc/metadata" ) -func newLogsExporter(cfg component.ExporterConfig, set component.ExporterCreateSettings) (*logsExporter, error) { +func newLogsExporter(cfg component.Config, set component.ExporterCreateSettings) (*logsExporter, error) { oCfg := cfg.(*Config) if oCfg.Logs.Endpoint == "" || oCfg.Logs.Endpoint == "https://" || oCfg.Logs.Endpoint == "http://" { diff --git a/exporter/coralogixexporter/metrics_client.go b/exporter/coralogixexporter/metrics_client.go index 3abc26a17199..5ea26da1de66 100644 --- a/exporter/coralogixexporter/metrics_client.go +++ b/exporter/coralogixexporter/metrics_client.go @@ -33,7 +33,7 @@ import ( "google.golang.org/grpc/status" ) -func newMetricsExporter(cfg component.ExporterConfig, set component.ExporterCreateSettings) (*exporter, error) { +func newMetricsExporter(cfg component.Config, set component.ExporterCreateSettings) (*exporter, error) { oCfg := cfg.(*Config) if oCfg.Metrics.Endpoint == "" || oCfg.Metrics.Endpoint == "https://" || oCfg.Metrics.Endpoint == "http://" { diff --git a/exporter/coralogixexporter/traces_client.go b/exporter/coralogixexporter/traces_client.go index 082031504cd6..2ae38680be47 100644 --- a/exporter/coralogixexporter/traces_client.go +++ b/exporter/coralogixexporter/traces_client.go @@ -41,7 +41,7 @@ type tracesExporter struct { userAgent string } -func newTracesExporter(cfg component.ExporterConfig, set component.ExporterCreateSettings) (*tracesExporter, error) { +func newTracesExporter(cfg component.Config, set component.ExporterCreateSettings) (*tracesExporter, error) { oCfg, ok := cfg.(*Config) if !ok { return nil, fmt.Errorf("invalid config exporter, expect type: %T, got: %T", &Config{}, cfg) diff --git a/exporter/datadogexporter/config.go b/exporter/datadogexporter/config.go index 6e855d7babc2..d294c1a58c79 100644 --- a/exporter/datadogexporter/config.go +++ b/exporter/datadogexporter/config.go @@ -366,9 +366,9 @@ type Config struct { OnlyMetadata bool `mapstructure:"only_metadata"` } -var _ component.ExporterConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) -// Validate the configuration for errors. This is required by component.ExporterConfig. +// Validate the configuration for errors. This is required by component.Config. func (c *Config) Validate() error { if c.OnlyMetadata && (!c.HostMetadata.Enabled || c.HostMetadata.HostnameSource != HostnameSourceFirstResource) { return errNoMetadata diff --git a/exporter/datadogexporter/factory.go b/exporter/datadogexporter/factory.go index e40d7c2b95cb..5d714e7d1ea9 100644 --- a/exporter/datadogexporter/factory.go +++ b/exporter/datadogexporter/factory.go @@ -81,7 +81,7 @@ func defaulttimeoutSettings() exporterhelper.TimeoutSettings { } // createDefaultConfig creates the default exporter configuration -func (f *factory) createDefaultConfig() component.ExporterConfig { +func (f *factory) createDefaultConfig() component.Config { hostnameSource := HostnameSourceFirstResource if f.registry.IsEnabled(metadata.HostnamePreviewFeatureGate) { hostnameSource = HostnameSourceConfigOrSystem @@ -140,7 +140,7 @@ func (f *factory) createDefaultConfig() component.ExporterConfig { // checkAndCastConfig checks the configuration type and its warnings, and casts it to // the Datadog Config struct. -func checkAndCastConfig(c component.ExporterConfig) *Config { +func checkAndCastConfig(c component.Config) *Config { cfg, ok := c.(*Config) if !ok { panic("programming error: config structure is not of type *datadogexporter.Config") @@ -152,7 +152,7 @@ func checkAndCastConfig(c component.ExporterConfig) *Config { func (f *factory) createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - c component.ExporterConfig, + c component.Config, ) (component.MetricsExporter, error) { cfg := checkAndCastConfig(c) @@ -212,7 +212,7 @@ func (f *factory) createMetricsExporter( func (f *factory) createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - c component.ExporterConfig, + c component.Config, ) (component.TracesExporter, error) { cfg := checkAndCastConfig(c) @@ -275,7 +275,7 @@ func (f *factory) createTracesExporter( func (f *factory) createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - c component.ExporterConfig, + c component.Config, ) (component.LogsExporter, error) { cfg := checkAndCastConfig(c) diff --git a/exporter/datadogexporter/factory_test.go b/exporter/datadogexporter/factory_test.go index e24a0cdcbe9e..64b3f89d060f 100644 --- a/exporter/datadogexporter/factory_test.go +++ b/exporter/datadogexporter/factory_test.go @@ -96,7 +96,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, "default"), @@ -262,7 +262,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) @@ -353,10 +353,10 @@ func TestOverrideEndpoints(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(component.NewIDWithName(typeStr, testInstance.componentID).String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) componentCfg, ok := cfg.(*Config) - require.True(t, ok, "component.ExporterConfig is not a Datadog exporter config (wrong ID?)") + require.True(t, ok, "component.Config is not a Datadog exporter config (wrong ID?)") assert.Equal(t, testInstance.expectedSite, componentCfg.API.Site) assert.Equal(t, testInstance.expectedMetricsEndpoint, componentCfg.Metrics.Endpoint) assert.Equal(t, testInstance.expectedTracesEndpoint, componentCfg.Traces.Endpoint) @@ -376,7 +376,7 @@ func TestCreateAPIMetricsExporter(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "api").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) c := cfg.(*Config) c.Metrics.TCPAddr.Endpoint = server.URL @@ -404,7 +404,7 @@ func TestCreateAPIExporterFailOnInvalidKey(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "api").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) // Use the mock server for API key validation c := cfg.(*Config) @@ -479,7 +479,7 @@ func TestCreateAPILogsExporter(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "api").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) c := cfg.(*Config) c.Metrics.TCPAddr.Endpoint = server.URL diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index e10828cb4692..f7562cffb356 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -23,14 +23,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.66.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/featuregate v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index ec81691925e7..6066ce68fcf4 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -706,23 +706,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0 h1:ZHEOeGOIYIDTKhI9xs30/obFfhUbb9b2+e/eahp1fJA= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 h1:/+HfaoVPSXgHUZOTZSSriuKOQi8L/rgyb7TTRx5jzoo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= diff --git a/exporter/dynatraceexporter/factory.go b/exporter/dynatraceexporter/factory.go index 8dbd1b752c4f..cb30e0ddd185 100644 --- a/exporter/dynatraceexporter/factory.go +++ b/exporter/dynatraceexporter/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ExporterFactory { } // createDefaultConfig creates the default exporter configuration -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &dtconfig.Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.NewDefaultRetrySettings(), @@ -64,7 +64,7 @@ func createDefaultConfig() component.ExporterConfig { func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - c component.ExporterConfig, + c component.Config, ) (component.MetricsExporter, error) { cfg := c.(*dtconfig.Config) diff --git a/exporter/dynatraceexporter/factory_test.go b/exporter/dynatraceexporter/factory_test.go index 891da58ab16c..f574f27c65e6 100644 --- a/exporter/dynatraceexporter/factory_test.go +++ b/exporter/dynatraceexporter/factory_test.go @@ -60,7 +60,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config errorMessage string }{ { @@ -143,7 +143,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index 6f091047c78d..e4a439e28407 100644 --- a/exporter/dynatraceexporter/go.mod +++ b/exporter/dynatraceexporter/go.mod @@ -7,10 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -34,7 +34,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum index 1665b3c33e1e..c1862eb6af26 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/go.sum @@ -284,16 +284,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/elasticsearchexporter/config_test.go b/exporter/elasticsearchexporter/config_test.go index 82f3aea780cd..224e89e4e25f 100644 --- a/exporter/elasticsearchexporter/config_test.go +++ b/exporter/elasticsearchexporter/config_test.go @@ -34,7 +34,7 @@ func TestLoad_DeprecatedIndexConfigOption(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "log").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, cfg, &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), @@ -86,7 +86,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -181,7 +181,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/elasticsearchexporter/factory.go b/exporter/elasticsearchexporter/factory.go index e32bc85e8f64..282374465984 100644 --- a/exporter/elasticsearchexporter/factory.go +++ b/exporter/elasticsearchexporter/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: HTTPClientSettings{ @@ -72,7 +72,7 @@ func createDefaultConfig() component.ExporterConfig { func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.LogsExporter, error) { if cfg.(*Config).Index != "" { set.Logger.Warn("index option are deprecated and replaced with logs_index and traces_index.") @@ -94,7 +94,7 @@ func createLogsExporter( func createTracesExporter(ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig) (component.TracesExporter, error) { + cfg component.Config) (component.TracesExporter, error) { exporter, err := newTracesExporter(set.Logger, cfg.(*Config)) if err != nil { diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index 837f1678e1b5..7ed886c209bc 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -9,9 +9,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -33,8 +33,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index 7027c1aa2e30..621bc7ad7671 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -281,16 +281,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/f5cloudexporter/config_test.go b/exporter/f5cloudexporter/config_test.go index f62a8a0184d3..0e0f17696b1a 100644 --- a/exporter/f5cloudexporter/config_test.go +++ b/exporter/f5cloudexporter/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "allsettings").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) actualCfg := cfg.(*Config) expectedCfg := &Config{ diff --git a/exporter/f5cloudexporter/factory.go b/exporter/f5cloudexporter/factory.go index ef71f2c01959..9b92e6600899 100644 --- a/exporter/f5cloudexporter/factory.go +++ b/exporter/f5cloudexporter/factory.go @@ -51,7 +51,7 @@ func (f *f5cloudFactory) Type() component.Type { func (f *f5cloudFactory) CreateMetricsExporter( ctx context.Context, params component.ExporterCreateSettings, - config component.ExporterConfig) (component.MetricsExporter, error) { + config component.Config) (component.MetricsExporter, error) { cfg := config.(*Config) @@ -67,7 +67,7 @@ func (f *f5cloudFactory) CreateMetricsExporter( func (f *f5cloudFactory) CreateTracesExporter( ctx context.Context, params component.ExporterCreateSettings, - config component.ExporterConfig) (component.TracesExporter, error) { + config component.Config) (component.TracesExporter, error) { cfg := config.(*Config) @@ -83,7 +83,7 @@ func (f *f5cloudFactory) CreateTracesExporter( func (f *f5cloudFactory) CreateLogsExporter( ctx context.Context, params component.ExporterCreateSettings, - config component.ExporterConfig) (component.LogsExporter, error) { + config component.Config) (component.LogsExporter, error) { cfg := config.(*Config) @@ -96,7 +96,7 @@ func (f *f5cloudFactory) CreateLogsExporter( return f.ExporterFactory.CreateLogsExporter(ctx, params, &cfg.Config) } -func (f *f5cloudFactory) CreateDefaultConfig() component.ExporterConfig { +func (f *f5cloudFactory) CreateDefaultConfig() component.Config { cfg := &Config{ Config: *f.ExporterFactory.CreateDefaultConfig().(*otlphttp.Config), AuthConfig: AuthConfig{ diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index ae03aa385498..ba17ea6aadda 100644 --- a/exporter/f5cloudexporter/go.mod +++ b/exporter/f5cloudexporter/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90 golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 google.golang.org/api v0.103.0 ) @@ -40,9 +40,9 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum index 6cd90f98d051..bebf7ab86e62 100644 --- a/exporter/f5cloudexporter/go.sum +++ b/exporter/f5cloudexporter/go.sum @@ -299,18 +299,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.0 h1:Nqopv2VdkjI/kCg8SsZYBD5R+Gd3OlM5lAZ2N+Exx60= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.0/go.mod h1:Gx9WIGE9pUv38Sm8IN0IPM7k+mX2hHGfRZI/65pOSIc= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:KkI/to7/yvuL5zHzhviy7UXMZVZ7jbfnk+YCAwCiimA= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:Gx9WIGE9pUv38Sm8IN0IPM7k+mX2hHGfRZI/65pOSIc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/collector/receiver/otlpreceiver v0.65.0 h1:XIfbhgAORTpq20LPtSZer1Y5/7b80nYXaAGa0rVaUxY= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= diff --git a/exporter/fileexporter/config.go b/exporter/fileexporter/config.go index b2642c5ab912..cfa479fed638 100644 --- a/exporter/fileexporter/config.go +++ b/exporter/fileexporter/config.go @@ -71,7 +71,7 @@ type Rotation struct { LocalTime bool `mapstructure:"localtime"` } -var _ component.ExporterConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/fileexporter/config_test.go b/exporter/fileexporter/config_test.go index 1ad968695de0..a54b692f139b 100644 --- a/exporter/fileexporter/config_test.go +++ b/exporter/fileexporter/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config errorMessage string }{ { @@ -109,7 +109,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) diff --git a/exporter/fileexporter/factory.go b/exporter/fileexporter/factory.go index 3807305ee227..7c433dccf522 100644 --- a/exporter/fileexporter/factory.go +++ b/exporter/fileexporter/factory.go @@ -54,7 +54,7 @@ func NewFactory() component.ExporterFactory { component.WithLogsExporter(createLogsExporter, stability)) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), FormatType: formatTypeJSON, @@ -65,7 +65,7 @@ func createDefaultConfig() component.ExporterConfig { func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.TracesExporter, error) { conf := cfg.(*Config) writer, err := buildFileWriter(conf) @@ -96,7 +96,7 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.MetricsExporter, error) { conf := cfg.(*Config) writer, err := buildFileWriter(conf) @@ -127,7 +127,7 @@ func createMetricsExporter( func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.LogsExporter, error) { conf := cfg.(*Config) writer, err := buildFileWriter(conf) diff --git a/exporter/fileexporter/go.mod b/exporter/fileexporter/go.mod index 162bb0c837da..33a26884dd21 100644 --- a/exporter/fileexporter/go.mod +++ b/exporter/fileexporter/go.mod @@ -7,10 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 gopkg.in/natefinch/lumberjack.v2 v2.0.0 ) @@ -29,7 +29,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/fileexporter/go.sum b/exporter/fileexporter/go.sum index f27fe3bf789c..b401b5c4290d 100644 --- a/exporter/fileexporter/go.sum +++ b/exporter/fileexporter/go.sum @@ -277,16 +277,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/googlecloudexporter/config_test.go b/exporter/googlecloudexporter/config_test.go index 6850cb0a6db7..acde8491cad6 100644 --- a/exporter/googlecloudexporter/config_test.go +++ b/exporter/googlecloudexporter/config_test.go @@ -48,13 +48,13 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, sanitize(cfg.(*Config)), sanitize(factory.CreateDefaultConfig().(*Config))) sub, err = cm.Sub(component.NewIDWithName(typeStr, "customname").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, sanitize(cfg.(*Config)), &Config{ diff --git a/exporter/googlecloudexporter/factory.go b/exporter/googlecloudexporter/factory.go index 7dc34474c644..fe60bf926560 100644 --- a/exporter/googlecloudexporter/factory.go +++ b/exporter/googlecloudexporter/factory.go @@ -54,7 +54,7 @@ func NewFactory() component.ExporterFactory { } // createDefaultConfig creates the default configuration for exporter. -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { if !featuregate.GetRegistry().IsEnabled(pdataExporterFeatureGate) { return &LegacyConfig{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), @@ -76,7 +76,7 @@ func createDefaultConfig() component.ExporterConfig { func createLogsExporter( ctx context.Context, params component.ExporterCreateSettings, - cfg component.ExporterConfig) (component.LogsExporter, error) { + cfg component.Config) (component.LogsExporter, error) { var eCfg *Config if !featuregate.GetRegistry().IsEnabled(pdataExporterFeatureGate) { eCfg = toNewConfig(cfg.(*LegacyConfig)) @@ -104,7 +104,7 @@ func createLogsExporter( func createTracesExporter( ctx context.Context, params component.ExporterCreateSettings, - cfg component.ExporterConfig) (component.TracesExporter, error) { + cfg component.Config) (component.TracesExporter, error) { var eCfg *Config if !featuregate.GetRegistry().IsEnabled(pdataExporterFeatureGate) { eCfg = toNewConfig(cfg.(*LegacyConfig)) @@ -132,7 +132,7 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, params component.ExporterCreateSettings, - cfg component.ExporterConfig) (component.MetricsExporter, error) { + cfg component.Config) (component.MetricsExporter, error) { if !featuregate.GetRegistry().IsEnabled(pdataExporterFeatureGate) { eCfg := cfg.(*LegacyConfig) return newLegacyGoogleCloudMetricsExporter(eCfg, params) diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index 96fed6266fa3..0e0f806a7d74 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -11,11 +11,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/featuregate v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 google.golang.org/api v0.103.0 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c google.golang.org/grpc v1.51.0 @@ -75,8 +75,8 @@ require ( github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index e79d9eb5fe38..050aabd94d16 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -453,21 +453,21 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/exporter/googlecloudpubsubexporter/config_test.go b/exporter/googlecloudpubsubexporter/config_test.go index 4cd5e3271ef5..e3550a4ca9cb 100644 --- a/exporter/googlecloudpubsubexporter/config_test.go +++ b/exporter/googlecloudpubsubexporter/config_test.go @@ -34,14 +34,14 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) defaultConfig := factory.CreateDefaultConfig().(*Config) assert.Equal(t, cfg, defaultConfig) sub, err = cm.Sub(component.NewIDWithName(typeStr, "customname").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) customConfig := factory.CreateDefaultConfig().(*Config) diff --git a/exporter/googlecloudpubsubexporter/factory.go b/exporter/googlecloudpubsubexporter/factory.go index 8c891ea77ce3..7758120d25d8 100644 --- a/exporter/googlecloudpubsubexporter/factory.go +++ b/exporter/googlecloudpubsubexporter/factory.go @@ -81,7 +81,7 @@ func ensureExporter(params component.ExporterCreateSettings, pCfg *Config) *pubs } // createDefaultConfig creates the default configuration for exporter. -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), UserAgent: "opentelemetry-collector-contrib {{version}}", @@ -96,7 +96,7 @@ func createDefaultConfig() component.ExporterConfig { func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig) (component.TracesExporter, error) { + cfg component.Config) (component.TracesExporter, error) { pCfg := cfg.(*Config) pubsubExporter := ensureExporter(set, pCfg) @@ -118,7 +118,7 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig) (component.MetricsExporter, error) { + cfg component.Config) (component.MetricsExporter, error) { pCfg := cfg.(*Config) pubsubExporter := ensureExporter(set, pCfg) @@ -139,7 +139,7 @@ func createMetricsExporter( func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig) (component.LogsExporter, error) { + cfg component.Config) (component.LogsExporter, error) { pCfg := cfg.(*Config) pubsubExporter := ensureExporter(set, pCfg) diff --git a/exporter/googlecloudpubsubexporter/go.mod b/exporter/googlecloudpubsubexporter/go.mod index d67050c23524..c9f25ad4a969 100644 --- a/exporter/googlecloudpubsubexporter/go.mod +++ b/exporter/googlecloudpubsubexporter/go.mod @@ -6,10 +6,10 @@ require ( cloud.google.com/go/pubsub v1.26.0 github.com/google/uuid v1.3.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 google.golang.org/api v0.103.0 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c @@ -41,7 +41,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/googlecloudpubsubexporter/go.sum b/exporter/googlecloudpubsubexporter/go.sum index 512c32639463..387e9b7d90f2 100644 --- a/exporter/googlecloudpubsubexporter/go.sum +++ b/exporter/googlecloudpubsubexporter/go.sum @@ -297,16 +297,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/googlemanagedprometheusexporter/factory.go b/exporter/googlemanagedprometheusexporter/factory.go index 148a7734aa7e..89e49535257d 100644 --- a/exporter/googlemanagedprometheusexporter/factory.go +++ b/exporter/googlemanagedprometheusexporter/factory.go @@ -42,7 +42,7 @@ func NewFactory() component.ExporterFactory { } // createDefaultConfig creates the default configuration for exporter. -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: defaultTimeout}, @@ -55,7 +55,7 @@ func createDefaultConfig() component.ExporterConfig { func createMetricsExporter( ctx context.Context, params component.ExporterCreateSettings, - cfg component.ExporterConfig) (component.MetricsExporter, error) { + cfg component.Config) (component.MetricsExporter, error) { eCfg := cfg.(*Config) mExp, err := collector.NewGoogleCloudMetricsExporter(ctx, eCfg.GMPConfig.toCollectorConfig(), params.TelemetrySettings.Logger, params.BuildInfo.Version, eCfg.Timeout) if err != nil { diff --git a/exporter/googlemanagedprometheusexporter/go.mod b/exporter/googlemanagedprometheusexporter/go.mod index 22043e0f9dd2..09bd2fee0a41 100644 --- a/exporter/googlemanagedprometheusexporter/go.mod +++ b/exporter/googlemanagedprometheusexporter/go.mod @@ -6,8 +6,8 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.34.1 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.34.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -61,11 +61,11 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/exporter/googlemanagedprometheusexporter/go.sum b/exporter/googlemanagedprometheusexporter/go.sum index 7d356b5536d7..1c3e83304bbe 100644 --- a/exporter/googlemanagedprometheusexporter/go.sum +++ b/exporter/googlemanagedprometheusexporter/go.sum @@ -440,21 +440,21 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/exporter/humioexporter/config_test.go b/exporter/humioexporter/config_test.go index b64a04c00511..e8f94b9ad0b1 100644 --- a/exporter/humioexporter/config_test.go +++ b/exporter/humioexporter/config_test.go @@ -31,7 +31,7 @@ import ( ) // Helper method to handle boilerplate of loading exporter configuration from file -func loadExporterConfig(t *testing.T, file string, id component.ID) (component.ExporterConfig, *Config) { +func loadExporterConfig(t *testing.T, file string, id component.ID) (component.Config, *Config) { // Initialize exporter factory cm, err := confmaptest.LoadConf(filepath.Join("testdata", file)) require.NoError(t, err) @@ -40,7 +40,7 @@ func loadExporterConfig(t *testing.T, file string, id component.ID) (component.E sub, err := cm.Sub(id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) def := factory.CreateDefaultConfig().(*Config) require.NotNil(t, def) diff --git a/exporter/humioexporter/factory.go b/exporter/humioexporter/factory.go index ddf0eed91021..84f67792cf56 100644 --- a/exporter/humioexporter/factory.go +++ b/exporter/humioexporter/factory.go @@ -41,7 +41,7 @@ func NewFactory() component.ExporterFactory { } // Provides a struct with default values for all relevant configuration settings -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), @@ -66,7 +66,7 @@ func createDefaultConfig() component.ExporterConfig { func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - config component.ExporterConfig, + config component.Config, ) (component.TracesExporter, error) { if config == nil { return nil, errors.New("missing config") diff --git a/exporter/humioexporter/factory_test.go b/exporter/humioexporter/factory_test.go index bd6c62971f62..2f3ca239eede 100644 --- a/exporter/humioexporter/factory_test.go +++ b/exporter/humioexporter/factory_test.go @@ -42,7 +42,7 @@ func TestCreateTracesExporter(t *testing.T) { factory := newHumioFactory(t) testCases := []struct { desc string - cfg component.ExporterConfig + cfg component.Config wantErrorOnCreate bool wantErrorOnStart bool }{ diff --git a/exporter/humioexporter/go.mod b/exporter/humioexporter/go.mod index bbda38a9deda..525bc615399b 100644 --- a/exporter/humioexporter/go.mod +++ b/exporter/humioexporter/go.mod @@ -5,11 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -34,7 +34,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/humioexporter/go.sum b/exporter/humioexporter/go.sum index 7eed2fef9214..0059375af66a 100644 --- a/exporter/humioexporter/go.sum +++ b/exporter/humioexporter/go.sum @@ -286,18 +286,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/influxdbexporter/config_test.go b/exporter/influxdbexporter/config_test.go index 5874e429a2c0..2d5b7d41b897 100644 --- a/exporter/influxdbexporter/config_test.go +++ b/exporter/influxdbexporter/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -77,7 +77,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/influxdbexporter/factory.go b/exporter/influxdbexporter/factory.go index 70d3c6b7c30f..a75149671129 100644 --- a/exporter/influxdbexporter/factory.go +++ b/exporter/influxdbexporter/factory.go @@ -35,7 +35,7 @@ func NewFactory() component.ExporterFactory { ) } -func createTraceExporter(ctx context.Context, set component.ExporterCreateSettings, config component.ExporterConfig) (component.TracesExporter, error) { +func createTraceExporter(ctx context.Context, set component.ExporterCreateSettings, config component.Config) (component.TracesExporter, error) { cfg := config.(*Config) exporter := newTracesExporter(cfg, set) @@ -51,7 +51,7 @@ func createTraceExporter(ctx context.Context, set component.ExporterCreateSettin ) } -func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, config component.ExporterConfig) (component.MetricsExporter, error) { +func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, config component.Config) (component.MetricsExporter, error) { cfg := config.(*Config) exporter, err := newMetricsExporter(cfg, set) @@ -70,7 +70,7 @@ func createMetricsExporter(ctx context.Context, set component.ExporterCreateSett ) } -func createLogsExporter(ctx context.Context, set component.ExporterCreateSettings, config component.ExporterConfig) (component.LogsExporter, error) { +func createLogsExporter(ctx context.Context, set component.ExporterCreateSettings, config component.Config) (component.LogsExporter, error) { cfg := config.(*Config) exporter := newLogsExporter(cfg, set) @@ -86,7 +86,7 @@ func createLogsExporter(ctx context.Context, set component.ExporterCreateSetting ) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod index b9430aa11afd..8a66000d7de9 100644 --- a/exporter/influxdbexporter/go.mod +++ b/exporter/influxdbexporter/go.mod @@ -7,10 +7,10 @@ require ( github.com/influxdata/influxdb-observability/otel2influx v0.2.32 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -37,7 +37,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/influxdbexporter/go.sum b/exporter/influxdbexporter/go.sum index e6dc6aa5433c..3f7595a56aba 100644 --- a/exporter/influxdbexporter/go.sum +++ b/exporter/influxdbexporter/go.sum @@ -315,16 +315,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/instanaexporter/config.go b/exporter/instanaexporter/config.go index c9cfbfebd335..3fd9edf526ff 100644 --- a/exporter/instanaexporter/config.go +++ b/exporter/instanaexporter/config.go @@ -35,7 +35,7 @@ type Config struct { confighttp.HTTPClientSettings `mapstructure:",squash"` } -var _ component.ExporterConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/instanaexporter/exporter.go b/exporter/instanaexporter/exporter.go index 89f941f50263..fdef5cb7b8e1 100644 --- a/exporter/instanaexporter/exporter.go +++ b/exporter/instanaexporter/exporter.go @@ -93,7 +93,7 @@ func (e *instanaExporter) pushConvertedTraces(ctx context.Context, td ptrace.Tra return e.export(ctx, e.config.Endpoint, headers, req) } -func newInstanaExporter(cfg component.ExporterConfig, set component.ExporterCreateSettings) *instanaExporter { +func newInstanaExporter(cfg component.Config, set component.ExporterCreateSettings) *instanaExporter { iCfg := cfg.(*Config) userAgent := fmt.Sprintf("%s/%s (%s/%s)", set.BuildInfo.Description, set.BuildInfo.Version, runtime.GOOS, runtime.GOARCH) return &instanaExporter{ diff --git a/exporter/instanaexporter/factory.go b/exporter/instanaexporter/factory.go index f1ce2395e0a6..60e6e54ccee1 100644 --- a/exporter/instanaexporter/factory.go +++ b/exporter/instanaexporter/factory.go @@ -42,7 +42,7 @@ func NewFactory() component.ExporterFactory { } // createDefaultConfig creates the default exporter configuration -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -55,7 +55,7 @@ func createDefaultConfig() component.ExporterConfig { } // createTracesExporter creates a trace exporter based on this configuration -func createTracesExporter(ctx context.Context, set component.ExporterCreateSettings, config component.ExporterConfig) (component.TracesExporter, error) { +func createTracesExporter(ctx context.Context, set component.ExporterCreateSettings, config component.Config) (component.TracesExporter, error) { cfg := config.(*Config) ctx, cancel := context.WithCancel(ctx) diff --git a/exporter/instanaexporter/factory_test.go b/exporter/instanaexporter/factory_test.go index 608fc8f6bfd8..d985609480cc 100644 --- a/exporter/instanaexporter/factory_test.go +++ b/exporter/instanaexporter/factory_test.go @@ -56,7 +56,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(component.NewIDWithName(typeStr, "valid").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) err = component.ValidateConfig(cfg) @@ -78,7 +78,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(component.NewIDWithName(typeStr, "bad_endpoint").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) err = component.ValidateConfig(cfg) require.Error(t, err) @@ -88,7 +88,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(component.NewIDWithName(typeStr, "missing_agent_key").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) err = component.ValidateConfig(cfg) require.Error(t, err) diff --git a/exporter/instanaexporter/go.mod b/exporter/instanaexporter/go.mod index f43d602247e8..3267e06bd9c7 100644 --- a/exporter/instanaexporter/go.mod +++ b/exporter/instanaexporter/go.mod @@ -5,11 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -34,7 +34,7 @@ require ( github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/instanaexporter/go.sum b/exporter/instanaexporter/go.sum index 55c04139bddc..69aa73994cad 100644 --- a/exporter/instanaexporter/go.sum +++ b/exporter/instanaexporter/go.sum @@ -284,18 +284,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/jaegerexporter/config.go b/exporter/jaegerexporter/config.go index 7d86197d4418..d85f97a2f50d 100644 --- a/exporter/jaegerexporter/config.go +++ b/exporter/jaegerexporter/config.go @@ -31,7 +31,7 @@ type Config struct { configgrpc.GRPCClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. } -var _ component.ExporterConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/jaegerexporter/config_test.go b/exporter/jaegerexporter/config_test.go index 7f33e6a46fed..6b258e2f57ae 100644 --- a/exporter/jaegerexporter/config_test.go +++ b/exporter/jaegerexporter/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -76,7 +76,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/jaegerexporter/factory.go b/exporter/jaegerexporter/factory.go index 4d4e47a1e0be..bdc29d83a3e0 100644 --- a/exporter/jaegerexporter/factory.go +++ b/exporter/jaegerexporter/factory.go @@ -39,7 +39,7 @@ func NewFactory() component.ExporterFactory { component.WithTracesExporter(createTracesExporter, stability)) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), @@ -55,7 +55,7 @@ func createDefaultConfig() component.ExporterConfig { func createTracesExporter( _ context.Context, set component.ExporterCreateSettings, - config component.ExporterConfig, + config component.Config, ) (component.TracesExporter, error) { expCfg := config.(*Config) diff --git a/exporter/jaegerexporter/go.mod b/exporter/jaegerexporter/go.mod index 9fa976ad9e74..3089a8e83d39 100644 --- a/exporter/jaegerexporter/go.mod +++ b/exporter/jaegerexporter/go.mod @@ -8,10 +8,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.51.0 ) @@ -40,8 +40,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/jaegerexporter/go.sum b/exporter/jaegerexporter/go.sum index e8a09ec16971..10e00393e658 100644 --- a/exporter/jaegerexporter/go.sum +++ b/exporter/jaegerexporter/go.sum @@ -313,18 +313,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/jaegerthrifthttpexporter/config.go b/exporter/jaegerthrifthttpexporter/config.go index 5455c60c7cd5..835bf6cf14b8 100644 --- a/exporter/jaegerthrifthttpexporter/config.go +++ b/exporter/jaegerthrifthttpexporter/config.go @@ -26,7 +26,7 @@ type Config struct { confighttp.HTTPClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. } -var _ component.ExporterConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/jaegerthrifthttpexporter/config_test.go b/exporter/jaegerthrifthttpexporter/config_test.go index 9bb0c28aca5a..f2f82db8d8cc 100644 --- a/exporter/jaegerthrifthttpexporter/config_test.go +++ b/exporter/jaegerthrifthttpexporter/config_test.go @@ -39,7 +39,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -68,7 +68,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/jaegerthrifthttpexporter/factory.go b/exporter/jaegerthrifthttpexporter/factory.go index 9deb9bc89cd3..52703edf9524 100644 --- a/exporter/jaegerthrifthttpexporter/factory.go +++ b/exporter/jaegerthrifthttpexporter/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ExporterFactory { component.WithTracesExporter(createTracesExporter, stability)) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -52,7 +52,7 @@ func createDefaultConfig() component.ExporterConfig { func createTracesExporter( _ context.Context, set component.ExporterCreateSettings, - config component.ExporterConfig, + config component.Config, ) (component.TracesExporter, error) { expCfg := config.(*Config) diff --git a/exporter/jaegerthrifthttpexporter/go.mod b/exporter/jaegerthrifthttpexporter/go.mod index ab16cd1af001..694e2b3664a0 100644 --- a/exporter/jaegerthrifthttpexporter/go.mod +++ b/exporter/jaegerthrifthttpexporter/go.mod @@ -7,10 +7,10 @@ require ( github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -38,8 +38,8 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/jaegerthrifthttpexporter/go.sum b/exporter/jaegerthrifthttpexporter/go.sum index 47e964a51bf6..63d4e74f8bf9 100644 --- a/exporter/jaegerthrifthttpexporter/go.sum +++ b/exporter/jaegerthrifthttpexporter/go.sum @@ -298,18 +298,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/kafkaexporter/config.go b/exporter/kafkaexporter/config.go index 594fada19421..db9378f42e4e 100644 --- a/exporter/kafkaexporter/config.go +++ b/exporter/kafkaexporter/config.go @@ -100,7 +100,7 @@ type MetadataRetry struct { Backoff time.Duration `mapstructure:"backoff"` } -var _ component.ExporterConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/kafkaexporter/config_test.go b/exporter/kafkaexporter/config_test.go index 4f6cf44d206b..0949e68205b3 100644 --- a/exporter/kafkaexporter/config_test.go +++ b/exporter/kafkaexporter/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -89,7 +89,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/kafkaexporter/factory.go b/exporter/kafkaexporter/factory.go index 5b9bf06afac1..afd2f246600d 100644 --- a/exporter/kafkaexporter/factory.go +++ b/exporter/kafkaexporter/factory.go @@ -81,7 +81,7 @@ func NewFactory(options ...FactoryOption) component.ExporterFactory { ) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), @@ -116,7 +116,7 @@ type kafkaExporterFactory struct { func (f *kafkaExporterFactory) createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.TracesExporter, error) { oCfg := *(cfg.(*Config)) // Clone the config if oCfg.Topic == "" { @@ -146,7 +146,7 @@ func (f *kafkaExporterFactory) createTracesExporter( func (f *kafkaExporterFactory) createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.MetricsExporter, error) { oCfg := *(cfg.(*Config)) // Clone the config if oCfg.Topic == "" { @@ -176,7 +176,7 @@ func (f *kafkaExporterFactory) createMetricsExporter( func (f *kafkaExporterFactory) createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.LogsExporter, error) { oCfg := *(cfg.(*Config)) // Clone the config if oCfg.Topic == "" { diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index 33d65c3c5cd9..3cf2689b599c 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -11,11 +11,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/stretchr/testify v1.8.1 github.com/xdg-go/scram v1.1.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -55,7 +55,7 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/kafkaexporter/go.sum b/exporter/kafkaexporter/go.sum index e846260a8fb7..dc223880e203 100644 --- a/exporter/kafkaexporter/go.sum +++ b/exporter/kafkaexporter/go.sum @@ -334,18 +334,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/loadbalancingexporter/config_test.go b/exporter/loadbalancingexporter/config_test.go index edf50b965791..4e555e5d3e5b 100644 --- a/exporter/loadbalancingexporter/config_test.go +++ b/exporter/loadbalancingexporter/config_test.go @@ -31,6 +31,6 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) require.NotNil(t, cfg) } diff --git a/exporter/loadbalancingexporter/factory.go b/exporter/loadbalancingexporter/factory.go index 56cf29498c5d..090c3baf44c2 100644 --- a/exporter/loadbalancingexporter/factory.go +++ b/exporter/loadbalancingexporter/factory.go @@ -42,7 +42,7 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { otlpFactory := otlpexporter.NewFactory() otlpDefaultCfg := otlpFactory.CreateDefaultConfig().(*otlpexporter.Config) @@ -54,10 +54,10 @@ func createDefaultConfig() component.ExporterConfig { } } -func createTracesExporter(_ context.Context, params component.ExporterCreateSettings, cfg component.ExporterConfig) (component.TracesExporter, error) { +func createTracesExporter(_ context.Context, params component.ExporterCreateSettings, cfg component.Config) (component.TracesExporter, error) { return newTracesExporter(params, cfg) } -func createLogsExporter(_ context.Context, params component.ExporterCreateSettings, cfg component.ExporterConfig) (component.LogsExporter, error) { +func createLogsExporter(_ context.Context, params component.ExporterCreateSettings, cfg component.Config) (component.LogsExporter, error) { return newLogsExporter(params, cfg) } diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index addbe277acc7..c386448b8dbf 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -6,12 +6,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -61,8 +61,8 @@ require ( github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index 94c4dd0ccef4..5d1c384a004b 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -418,23 +418,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0 h1:uXNkGlAXHyvUZL51qsQR8hS8oSt80m1ncbqwXRRkJMk= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:3+YgPEDEyNzwiI+V9J2YBVGyV9Qppu4VPbB3jHeN8Ns= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/exporter/loadbalancingexporter/loadbalancer.go b/exporter/loadbalancingexporter/loadbalancer.go index 84e01fbc453e..480816cea04b 100644 --- a/exporter/loadbalancingexporter/loadbalancer.go +++ b/exporter/loadbalancingexporter/loadbalancer.go @@ -59,7 +59,7 @@ type loadBalancerImp struct { } // Create new load balancer -func newLoadBalancer(params component.ExporterCreateSettings, cfg component.ExporterConfig, factory componentFactory) (*loadBalancerImp, error) { +func newLoadBalancer(params component.ExporterCreateSettings, cfg component.Config, factory componentFactory) (*loadBalancerImp, error) { oCfg := cfg.(*Config) if oCfg.Resolver.DNS != nil && oCfg.Resolver.Static != nil { diff --git a/exporter/loadbalancingexporter/loadbalancer_test.go b/exporter/loadbalancingexporter/loadbalancer_test.go index 4588cde392c4..5f89e240f8d7 100644 --- a/exporter/loadbalancingexporter/loadbalancer_test.go +++ b/exporter/loadbalancingexporter/loadbalancer_test.go @@ -233,12 +233,12 @@ func TestRemoveExtraExporters(t *testing.T) { func TestAddMissingExporters(t *testing.T) { // prepare cfg := simpleConfig() - exporterFactory := component.NewExporterFactory("otlp", func() component.ExporterConfig { + exporterFactory := component.NewExporterFactory("otlp", func() component.Config { return &otlpexporter.Config{} }, component.WithTracesExporter(func( _ context.Context, _ component.ExporterCreateSettings, - _ component.ExporterConfig, + _ component.Config, ) (component.TracesExporter, error) { return newNopMockTracesExporter(), nil }, component.StabilityLevelDevelopment)) @@ -267,12 +267,12 @@ func TestFailedToAddMissingExporters(t *testing.T) { // prepare cfg := simpleConfig() expectedErr := errors.New("some expected error") - exporterFactory := component.NewExporterFactory("otlp", func() component.ExporterConfig { + exporterFactory := component.NewExporterFactory("otlp", func() component.Config { return &otlpexporter.Config{} }, component.WithTracesExporter(func( _ context.Context, _ component.ExporterCreateSettings, - _ component.ExporterConfig, + _ component.Config, ) (component.TracesExporter, error) { return nil, expectedErr }, component.StabilityLevelDevelopment)) diff --git a/exporter/loadbalancingexporter/log_exporter.go b/exporter/loadbalancingexporter/log_exporter.go index e41b0a6a7c29..4c61b40070ca 100644 --- a/exporter/loadbalancingexporter/log_exporter.go +++ b/exporter/loadbalancingexporter/log_exporter.go @@ -43,7 +43,7 @@ type logExporterImp struct { } // Create new logs exporter -func newLogsExporter(params component.ExporterCreateSettings, cfg component.ExporterConfig) (*logExporterImp, error) { +func newLogsExporter(params component.ExporterCreateSettings, cfg component.Config) (*logExporterImp, error) { exporterFactory := otlpexporter.NewFactory() lb, err := newLoadBalancer(params, cfg, func(ctx context.Context, endpoint string) (component.Component, error) { diff --git a/exporter/loadbalancingexporter/trace_exporter.go b/exporter/loadbalancingexporter/trace_exporter.go index 20f4e537f7f8..a3ffedcd7d51 100644 --- a/exporter/loadbalancingexporter/trace_exporter.go +++ b/exporter/loadbalancingexporter/trace_exporter.go @@ -44,7 +44,7 @@ type traceExporterImp struct { } // Create new traces exporter -func newTracesExporter(params component.ExporterCreateSettings, cfg component.ExporterConfig) (*traceExporterImp, error) { +func newTracesExporter(params component.ExporterCreateSettings, cfg component.Config) (*traceExporterImp, error) { exporterFactory := otlpexporter.NewFactory() lb, err := newLoadBalancer(params, cfg, func(ctx context.Context, endpoint string) (component.Component, error) { diff --git a/exporter/logzioexporter/config_test.go b/exporter/logzioexporter/config_test.go index 160bc98330d7..49be3bb7c586 100644 --- a/exporter/logzioexporter/config_test.go +++ b/exporter/logzioexporter/config_test.go @@ -38,7 +38,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "2").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) expected := &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), @@ -69,7 +69,7 @@ func TestDefaultLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "2").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) expected := &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), diff --git a/exporter/logzioexporter/factory.go b/exporter/logzioexporter/factory.go index 653814a83dff..271757895ec0 100644 --- a/exporter/logzioexporter/factory.go +++ b/exporter/logzioexporter/factory.go @@ -44,7 +44,7 @@ func NewFactory() component.ExporterFactory { } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ Region: "", Token: "", @@ -101,12 +101,12 @@ func generateEndpoint(cfg *Config) (string, error) { } } -func createTracesExporter(_ context.Context, params component.ExporterCreateSettings, cfg component.ExporterConfig) (component.TracesExporter, error) { +func createTracesExporter(_ context.Context, params component.ExporterCreateSettings, cfg component.Config) (component.TracesExporter, error) { exporterConfig := cfg.(*Config) return newLogzioTracesExporter(exporterConfig, params) } -func createLogsExporter(_ context.Context, params component.ExporterCreateSettings, cfg component.ExporterConfig) (component.LogsExporter, error) { +func createLogsExporter(_ context.Context, params component.ExporterCreateSettings, cfg component.Config) (component.LogsExporter, error) { exporterConfig := cfg.(*Config) return newLogzioLogsExporter(exporterConfig, params) } diff --git a/exporter/logzioexporter/factory_test.go b/exporter/logzioexporter/factory_test.go index 965e1bcdf399..27211f43baa8 100644 --- a/exporter/logzioexporter/factory_test.go +++ b/exporter/logzioexporter/factory_test.go @@ -43,7 +43,7 @@ func TestCreateTracesExporter(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "2").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) params := componenttest.NewNopExporterCreateSettings() exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index 0ca36b3b74ce..f352c38e31b5 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -8,11 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c google.golang.org/protobuf v1.28.1 @@ -45,7 +45,7 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index 664b491c87ee..e26315a441e6 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -306,18 +306,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/lokiexporter/config_test.go b/exporter/lokiexporter/config_test.go index 5cd22220f51e..09816623c117 100644 --- a/exporter/lokiexporter/config_test.go +++ b/exporter/lokiexporter/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfigNewExporter(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, "allsettings"), @@ -82,7 +82,7 @@ func TestLoadConfigNewExporter(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/lokiexporter/factory.go b/exporter/lokiexporter/factory.go index 0b63c445814d..489e397fc600 100644 --- a/exporter/lokiexporter/factory.go +++ b/exporter/lokiexporter/factory.go @@ -35,7 +35,7 @@ func NewFactory() component.ExporterFactory { ) } -func createLogsExporter(ctx context.Context, set component.ExporterCreateSettings, config component.ExporterConfig) (component.LogsExporter, error) { +func createLogsExporter(ctx context.Context, set component.ExporterCreateSettings, config component.Config) (component.LogsExporter, error) { expCfg := config.(*Config) // this should go away once the legacy code is removed, as the config validation happens during the loading diff --git a/exporter/lokiexporter/factory_deprecated.go b/exporter/lokiexporter/factory_deprecated.go index 9b715b90f72d..12cce974e45e 100644 --- a/exporter/lokiexporter/factory_deprecated.go +++ b/exporter/lokiexporter/factory_deprecated.go @@ -24,7 +24,7 @@ import ( "go.opentelemetry.io/collector/exporter/exporterhelper" ) -func createDefaultLegacyConfig() component.ExporterConfig { +func createDefaultLegacyConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index 905410f9f0f8..3c1dec8df3f5 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -11,11 +11,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.66.0 github.com/prometheus/common v0.37.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -97,7 +97,7 @@ require ( go.etcd.io/etcd/client/pkg/v3 v3.5.4 // indirect go.etcd.io/etcd/client/v3 v3.5.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index 38c1d59c26af..c11820a44d69 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -1179,18 +1179,18 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= diff --git a/exporter/lokiexporter/legacy_config_test.go b/exporter/lokiexporter/legacy_config_test.go index 60042ebd63c1..484e832f2501 100644 --- a/exporter/lokiexporter/legacy_config_test.go +++ b/exporter/lokiexporter/legacy_config_test.go @@ -39,7 +39,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, "allsettings"), @@ -138,7 +138,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/mezmoexporter/config_test.go b/exporter/mezmoexporter/config_test.go index 141e7990c6e3..e04d4b02a6c3 100644 --- a/exporter/mezmoexporter/config_test.go +++ b/exporter/mezmoexporter/config_test.go @@ -40,7 +40,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -77,7 +77,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/mezmoexporter/factory.go b/exporter/mezmoexporter/factory.go index ba5bf133b2a8..7164b42ec47c 100644 --- a/exporter/mezmoexporter/factory.go +++ b/exporter/mezmoexporter/factory.go @@ -39,7 +39,7 @@ func NewFactory() component.ExporterFactory { } // Create a default Memzo config -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), HTTPClientSettings: createDefaultHTTPClientSettings(), @@ -50,7 +50,7 @@ func createDefaultConfig() component.ExporterConfig { } // Create a log exporter for exporting to Mezmo -func createLogsExporter(ctx context.Context, settings component.ExporterCreateSettings, exporterConfig component.ExporterConfig) (component.LogsExporter, error) { +func createLogsExporter(ctx context.Context, settings component.ExporterCreateSettings, exporterConfig component.Config) (component.LogsExporter, error) { log := settings.Logger if exporterConfig == nil { diff --git a/exporter/mezmoexporter/go.mod b/exporter/mezmoexporter/go.mod index a979716fecbe..b46caa69c212 100644 --- a/exporter/mezmoexporter/go.mod +++ b/exporter/mezmoexporter/go.mod @@ -4,10 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -31,8 +31,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/mezmoexporter/go.sum b/exporter/mezmoexporter/go.sum index ea7683310ec6..5912698b48e5 100644 --- a/exporter/mezmoexporter/go.sum +++ b/exporter/mezmoexporter/go.sum @@ -289,18 +289,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/opencensusexporter/config.go b/exporter/opencensusexporter/config.go index b5000b2ac813..671d206c22ae 100644 --- a/exporter/opencensusexporter/config.go +++ b/exporter/opencensusexporter/config.go @@ -32,7 +32,7 @@ type Config struct { NumWorkers int `mapstructure:"num_workers"` } -var _ component.ExporterConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/opencensusexporter/config_test.go b/exporter/opencensusexporter/config_test.go index bd6c1d8e4428..bf5da27f74c1 100644 --- a/exporter/opencensusexporter/config_test.go +++ b/exporter/opencensusexporter/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -92,7 +92,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/opencensusexporter/factory.go b/exporter/opencensusexporter/factory.go index 5419b93c5f62..c6a41c5066d0 100644 --- a/exporter/opencensusexporter/factory.go +++ b/exporter/opencensusexporter/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ExporterFactory { component.WithMetricsExporter(createMetricsExporter, stability)) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ @@ -52,7 +52,7 @@ func createDefaultConfig() component.ExporterConfig { } } -func createTracesExporter(ctx context.Context, set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.TracesExporter, error) { +func createTracesExporter(ctx context.Context, set component.ExporterCreateSettings, cfg component.Config) (component.TracesExporter, error) { oCfg := cfg.(*Config) oce, err := newTracesExporter(ctx, oCfg, set.TelemetrySettings) if err != nil { @@ -71,7 +71,7 @@ func createTracesExporter(ctx context.Context, set component.ExporterCreateSetti exporterhelper.WithShutdown(oce.shutdown)) } -func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.MetricsExporter, error) { +func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, cfg component.Config) (component.MetricsExporter, error) { oCfg := cfg.(*Config) oce, err := newMetricsExporter(ctx, oCfg, set.TelemetrySettings) if err != nil { diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index 8be169e4033d..8e599eaa7497 100644 --- a/exporter/opencensusexporter/go.mod +++ b/exporter/opencensusexporter/go.mod @@ -9,10 +9,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 google.golang.org/grpc v1.51.0 ) @@ -40,8 +40,8 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/soheilhy/cmux v0.1.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/opencensusexporter/go.sum b/exporter/opencensusexporter/go.sum index 9cd1fdffa931..c79d03b8e3a5 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -319,18 +319,18 @@ go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/parquetexporter/factory.go b/exporter/parquetexporter/factory.go index 0e0457935557..4e95e946aea2 100644 --- a/exporter/parquetexporter/factory.go +++ b/exporter/parquetexporter/factory.go @@ -44,7 +44,7 @@ func NewFactory() component.ExporterFactory { component.WithLogsExporter(createLogsExporter, stability)) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), } @@ -53,7 +53,7 @@ func createDefaultConfig() component.ExporterConfig { func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.TracesExporter, error) { fe := &parquetExporter{path: cfg.(*Config).Path} return exporterhelper.NewTracesExporter( @@ -69,7 +69,7 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.MetricsExporter, error) { fe := &parquetExporter{path: cfg.(*Config).Path} return exporterhelper.NewMetricsExporter( @@ -85,7 +85,7 @@ func createMetricsExporter( func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.LogsExporter, error) { fe := &parquetExporter{path: cfg.(*Config).Path} return exporterhelper.NewLogsExporter( diff --git a/exporter/parquetexporter/go.mod b/exporter/parquetexporter/go.mod index 01ef65734bc1..36bf43fef990 100644 --- a/exporter/parquetexporter/go.mod +++ b/exporter/parquetexporter/go.mod @@ -3,9 +3,9 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parque go 1.18 require ( - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -22,8 +22,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/parquetexporter/go.sum b/exporter/parquetexporter/go.sum index 62aa4a606157..70863f9d9055 100644 --- a/exporter/parquetexporter/go.sum +++ b/exporter/parquetexporter/go.sum @@ -278,16 +278,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/prometheusexporter/config.go b/exporter/prometheusexporter/config.go index a70d5dff16fb..026b17ff29cf 100644 --- a/exporter/prometheusexporter/config.go +++ b/exporter/prometheusexporter/config.go @@ -49,7 +49,7 @@ type Config struct { EnableOpenMetrics bool `mapstructure:"enable_open_metrics"` } -var _ component.ExporterConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/prometheusexporter/config_test.go b/exporter/prometheusexporter/config_test.go index fd3b8526f153..d27e843f0207 100644 --- a/exporter/prometheusexporter/config_test.go +++ b/exporter/prometheusexporter/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -74,7 +74,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/prometheusexporter/factory.go b/exporter/prometheusexporter/factory.go index 3797f10cb642..13a656116dd7 100644 --- a/exporter/prometheusexporter/factory.go +++ b/exporter/prometheusexporter/factory.go @@ -41,7 +41,7 @@ func NewFactory() component.ExporterFactory { component.WithMetricsExporter(createMetricsExporter, stability)) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), ConstLabels: map[string]string{}, @@ -54,7 +54,7 @@ func createDefaultConfig() component.ExporterConfig { func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.MetricsExporter, error) { pcfg := cfg.(*Config) diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index d3a13c955915..a8eb944659c3 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -12,11 +12,11 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -127,7 +127,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/prometheusexporter/go.sum b/exporter/prometheusexporter/go.sum index 06093544e6f8..8f94b01fc76c 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -623,19 +623,19 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/exporter/prometheusremotewriteexporter/config.go b/exporter/prometheusremotewriteexporter/config.go index 578d024b6a1c..9e567b8090c0 100644 --- a/exporter/prometheusremotewriteexporter/config.go +++ b/exporter/prometheusremotewriteexporter/config.go @@ -76,7 +76,7 @@ type RemoteWriteQueue struct { // TODO(jbd): Add capacity, max_samples_per_send to QueueConfig. -var _ component.ExporterConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/prometheusremotewriteexporter/config_test.go b/exporter/prometheusremotewriteexporter/config_test.go index 60cc09629fbf..32f56ddfff64 100644 --- a/exporter/prometheusremotewriteexporter/config_test.go +++ b/exporter/prometheusremotewriteexporter/config_test.go @@ -39,7 +39,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config errorMessage string }{ { @@ -102,7 +102,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) @@ -122,7 +122,7 @@ func TestDisabledQueue(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "disabled_queue").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.False(t, cfg.(*Config).RemoteWriteQueue.Enabled) } @@ -135,7 +135,7 @@ func TestDisabledTargetInfo(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "disabled_target_info").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.False(t, cfg.(*Config).TargetInfo.Enabled) } diff --git a/exporter/prometheusremotewriteexporter/factory.go b/exporter/prometheusremotewriteexporter/factory.go index c56e3cfef175..125520172037 100644 --- a/exporter/prometheusremotewriteexporter/factory.go +++ b/exporter/prometheusremotewriteexporter/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ExporterFactory { } func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig) (component.MetricsExporter, error) { + cfg component.Config) (component.MetricsExporter, error) { prwCfg, ok := cfg.(*Config) if !ok { @@ -82,7 +82,7 @@ func createMetricsExporter(ctx context.Context, set component.ExporterCreateSett return resourcetotelemetry.WrapMetricsExporter(prwCfg.ResourceToTelemetrySettings, exporter), nil } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), Namespace: "", diff --git a/exporter/prometheusremotewriteexporter/factory_test.go b/exporter/prometheusremotewriteexporter/factory_test.go index 36dfb2845e52..fa693c32ef64 100644 --- a/exporter/prometheusremotewriteexporter/factory_test.go +++ b/exporter/prometheusremotewriteexporter/factory_test.go @@ -49,7 +49,7 @@ func Test_createMetricsExporter(t *testing.T) { } tests := []struct { name string - cfg component.ExporterConfig + cfg component.Config set component.ExporterCreateSettings returnErrorOnCreate bool returnErrorOnStart bool diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index 4663045740f3..bf1f61f85159 100644 --- a/exporter/prometheusremotewriteexporter/go.mod +++ b/exporter/prometheusremotewriteexporter/go.mod @@ -13,10 +13,10 @@ require ( github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.1 github.com/tidwall/wal v1.1.7 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -45,8 +45,8 @@ require ( github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/tinylru v1.1.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/prometheusremotewriteexporter/go.sum b/exporter/prometheusremotewriteexporter/go.sum index bfa1199c6382..4a9ab14f2c0c 100644 --- a/exporter/prometheusremotewriteexporter/go.sum +++ b/exporter/prometheusremotewriteexporter/go.sum @@ -378,18 +378,18 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/pulsarexporter/config.go b/exporter/pulsarexporter/config.go index 9be494c42323..38c82d257a6f 100644 --- a/exporter/pulsarexporter/config.go +++ b/exporter/pulsarexporter/config.go @@ -74,7 +74,7 @@ type OAuth2 struct { Audience string `mapstructure:"audience"` } -var _ component.ExporterConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/pulsarexporter/config_test.go b/exporter/pulsarexporter/config_test.go index 4a979d7efec5..4c8df6c5ff37 100644 --- a/exporter/pulsarexporter/config_test.go +++ b/exporter/pulsarexporter/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -72,7 +72,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) @@ -88,7 +88,7 @@ func TestClientOptions(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) options := cfg.(*Config).clientOptions() diff --git a/exporter/pulsarexporter/factory.go b/exporter/pulsarexporter/factory.go index 53be99e5f8e0..a44cc1d72cce 100644 --- a/exporter/pulsarexporter/factory.go +++ b/exporter/pulsarexporter/factory.go @@ -66,7 +66,7 @@ func NewFactory(options ...FactoryOption) component.ExporterFactory { ) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), @@ -89,7 +89,7 @@ type pulsarExporterFactory struct { func (f *pulsarExporterFactory) createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.TracesExporter, error) { oCfg := *(cfg.(*Config)) if oCfg.Topic == "" { @@ -119,7 +119,7 @@ func (f *pulsarExporterFactory) createTracesExporter( func (f *pulsarExporterFactory) createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.MetricsExporter, error) { oCfg := *(cfg.(*Config)) if oCfg.Topic == "" { @@ -149,7 +149,7 @@ func (f *pulsarExporterFactory) createMetricsExporter( func (f *pulsarExporterFactory) createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.LogsExporter, error) { oCfg := *(cfg.(*Config)) if oCfg.Topic == "" { diff --git a/exporter/pulsarexporter/go.mod b/exporter/pulsarexporter/go.mod index abaa3eca4d1e..97c83f9cc912 100644 --- a/exporter/pulsarexporter/go.mod +++ b/exporter/pulsarexporter/go.mod @@ -9,11 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -64,7 +64,7 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/pulsarexporter/go.sum b/exporter/pulsarexporter/go.sum index 48c0ea327de6..244faea607b9 100644 --- a/exporter/pulsarexporter/go.sum +++ b/exporter/pulsarexporter/go.sum @@ -496,18 +496,18 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/sapmexporter/config_test.go b/exporter/sapmexporter/config_test.go index e36602ad49c5..7b7a1e61ed9b 100644 --- a/exporter/sapmexporter/config_test.go +++ b/exporter/sapmexporter/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -80,7 +80,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/sapmexporter/factory.go b/exporter/sapmexporter/factory.go index fdb3319d4e83..f0c7a26e3798 100644 --- a/exporter/sapmexporter/factory.go +++ b/exporter/sapmexporter/factory.go @@ -39,7 +39,7 @@ func NewFactory() component.ExporterFactory { component.WithTracesExporter(createTracesExporter, stability)) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), NumWorkers: defaultNumWorkers, @@ -55,7 +55,7 @@ func createDefaultConfig() component.ExporterConfig { func createTracesExporter( _ context.Context, params component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.TracesExporter, error) { eCfg := cfg.(*Config) return newSAPMTracesExporter(eCfg, params) diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index 9ede8280be4e..1c62c14a34bb 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -9,10 +9,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/signalfx/sapm-proto v0.12.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -38,8 +38,8 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index 5543450ca9c8..bf71baabe6d4 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -292,18 +292,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/sentryexporter/config_test.go b/exporter/sentryexporter/config_test.go index e50e84b9fb5e..d1fd069b9c35 100644 --- a/exporter/sentryexporter/config_test.go +++ b/exporter/sentryexporter/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -55,7 +55,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/sentryexporter/factory.go b/exporter/sentryexporter/factory.go index 24212f0a465f..c1aaec096b0a 100644 --- a/exporter/sentryexporter/factory.go +++ b/exporter/sentryexporter/factory.go @@ -37,7 +37,7 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), } @@ -46,7 +46,7 @@ func createDefaultConfig() component.ExporterConfig { func createTracesExporter( _ context.Context, params component.ExporterCreateSettings, - config component.ExporterConfig, + config component.Config, ) (component.TracesExporter, error) { sentryConfig, ok := config.(*Config) if !ok { diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index 8c5f9d9f7a0d..6a51b392f8d1 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -7,10 +7,10 @@ require ( github.com/google/go-cmp v0.5.9 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -29,8 +29,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index acd1dd896738..58ae8f386151 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -280,18 +280,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/signalfxexporter/config_test.go b/exporter/signalfxexporter/config_test.go index 33319600bd7d..a63e3cc3775d 100644 --- a/exporter/signalfxexporter/config_test.go +++ b/exporter/signalfxexporter/config_test.go @@ -50,7 +50,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -189,7 +189,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/signalfxexporter/factory.go b/exporter/signalfxexporter/factory.go index 3de4e65dbcff..833460ee4f86 100644 --- a/exporter/signalfxexporter/factory.go +++ b/exporter/signalfxexporter/factory.go @@ -54,7 +54,7 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), TimeoutSettings: exporterhelper.TimeoutSettings{Timeout: defaultHTTPTimeout}, @@ -73,7 +73,7 @@ func createDefaultConfig() component.ExporterConfig { func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - eCfg component.ExporterConfig, + eCfg component.Config, ) (component.TracesExporter, error) { cfg := eCfg.(*Config) corrCfg := cfg.Correlation @@ -103,7 +103,7 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - config component.ExporterConfig, + config component.Config, ) (component.MetricsExporter, error) { cfg := config.(*Config) @@ -186,7 +186,7 @@ func loadConfig(bytes []byte) (Config, error) { func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.LogsExporter, error) { expCfg := cfg.(*Config) diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index 7e543f6f1d26..f9c014d816ac 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -15,11 +15,11 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20220920175102-539ae8d8ba8e github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -63,7 +63,7 @@ require ( github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index 8bf09d72d775..98e7e9f9dca5 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -1230,18 +1230,18 @@ go.opentelemetry.io/collector v0.52.0/go.mod h1:a9GvaOhyc0nVOUzqvdv5mxyWghCSso/W go.opentelemetry.io/collector v0.54.0/go.mod h1:FgNzyfb4sAGb5cqusB5znETJ8Pz4OQUBGbOeGIZ2rlQ= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.65.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= go.opentelemetry.io/collector/component v0.65.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= go.opentelemetry.io/collector/consumer v0.65.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/model v0.49.0/go.mod h1:nOYQv9KoFPs6ihJwOi24qB209EOhS9HkwhGj54YiEAw= go.opentelemetry.io/collector/pdata v0.49.0/go.mod h1:YwmKuiFhNgtmhRdpi8Q8FAWPa0AwJTCSlssSsAtuRcY= go.opentelemetry.io/collector/pdata v0.52.0/go.mod h1:GJUTfTv8mlYpHRjcmHXVbvJr48EW/q/P/HuBvpXAE58= @@ -1249,16 +1249,16 @@ go.opentelemetry.io/collector/pdata v0.54.0/go.mod h1:1nSelv/YqGwdHHaIKNW9ZOHSMq go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.65.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/collector/processor/batchprocessor v0.65.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= go.opentelemetry.io/collector/semconv v0.52.0/go.mod h1:SxK0rUnUP7YeDakexzbE/vhimTOHwE6m/4aKKd9e27Q= go.opentelemetry.io/collector/semconv v0.54.0/go.mod h1:HAGkPKNMhc4kEHevEqVIEtUuvsRQMIbUWBb8yBrqEwk= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.65.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0/go.mod h1:J0dBVrt7dPS/lKJyQoW0xzQiUr4r2Ik1VwPjAUWnofI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= diff --git a/exporter/skywalkingexporter/config.go b/exporter/skywalkingexporter/config.go index cb8333e90d23..d9f94b3e5f5e 100644 --- a/exporter/skywalkingexporter/config.go +++ b/exporter/skywalkingexporter/config.go @@ -35,7 +35,7 @@ type Config struct { NumStreams int `mapstructure:"num_streams"` } -var _ component.ExporterConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/skywalkingexporter/config_test.go b/exporter/skywalkingexporter/config_test.go index e79b151ad67f..c60fa4795e43 100644 --- a/exporter/skywalkingexporter/config_test.go +++ b/exporter/skywalkingexporter/config_test.go @@ -40,7 +40,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -98,7 +98,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/skywalkingexporter/factory.go b/exporter/skywalkingexporter/factory.go index b48c810bc30a..6fdb66bb086a 100644 --- a/exporter/skywalkingexporter/factory.go +++ b/exporter/skywalkingexporter/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ExporterFactory { component.WithMetricsExporter(createMetricsExporter, stability)) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.NewDefaultRetrySettings(), @@ -58,7 +58,7 @@ func createDefaultConfig() component.ExporterConfig { func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.LogsExporter, error) { oCfg := cfg.(*Config) oce := newLogsExporter(ctx, oCfg, set.TelemetrySettings) @@ -76,7 +76,7 @@ func createLogsExporter( ) } -func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.MetricsExporter, error) { +func createMetricsExporter(ctx context.Context, set component.ExporterCreateSettings, cfg component.Config) (component.MetricsExporter, error) { oCfg := cfg.(*Config) oce := newMetricsExporter(ctx, oCfg, set.TelemetrySettings) return exporterhelper.NewMetricsExporter( diff --git a/exporter/skywalkingexporter/go.mod b/exporter/skywalkingexporter/go.mod index 049f6f862c0c..3517a2897d29 100644 --- a/exporter/skywalkingexporter/go.mod +++ b/exporter/skywalkingexporter/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 google.golang.org/grpc v1.51.0 skywalking.apache.org/repo/goapi v0.0.0-20211122071111-ffc517fbfe21 @@ -36,7 +36,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/skywalkingexporter/go.sum b/exporter/skywalkingexporter/go.sum index 54ed75ecc26d..a32ec47195ae 100644 --- a/exporter/skywalkingexporter/go.sum +++ b/exporter/skywalkingexporter/go.sum @@ -303,18 +303,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/splunkhecexporter/config_test.go b/exporter/splunkhecexporter/config_test.go index a0783e14594d..4c2e92451b6a 100644 --- a/exporter/splunkhecexporter/config_test.go +++ b/exporter/splunkhecexporter/config_test.go @@ -44,7 +44,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -111,7 +111,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/splunkhecexporter/factory.go b/exporter/splunkhecexporter/factory.go index 397f4214c07c..44cae02c3840 100644 --- a/exporter/splunkhecexporter/factory.go +++ b/exporter/splunkhecexporter/factory.go @@ -60,7 +60,7 @@ func NewFactory() component.ExporterFactory { component.WithLogsExporter(createLogsExporter, stability)) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ LogDataEnabled: true, ProfilingDataEnabled: true, @@ -92,7 +92,7 @@ func createDefaultConfig() component.ExporterConfig { func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - config component.ExporterConfig, + config component.Config, ) (component.TracesExporter, error) { if config == nil { return nil, errors.New("nil config") @@ -120,7 +120,7 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - config component.ExporterConfig, + config component.Config, ) (component.MetricsExporter, error) { if config == nil { return nil, errors.New("nil config") @@ -159,7 +159,7 @@ func createMetricsExporter( func createLogsExporter( ctx context.Context, set component.ExporterCreateSettings, - config component.ExporterConfig, + config component.Config, ) (exporter component.LogsExporter, err error) { if config == nil { return nil, errors.New("nil config") diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index 1f149d255366..612f708596aa 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -8,11 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -33,7 +33,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index 58ff3d283e81..94024930b762 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -277,18 +277,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/sumologicexporter/factory.go b/exporter/sumologicexporter/factory.go index 167f7111b556..7f53f047b430 100644 --- a/exporter/sumologicexporter/factory.go +++ b/exporter/sumologicexporter/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { qs := exporterhelper.NewDefaultQueueSettings() qs.Enabled = false @@ -66,7 +66,7 @@ func createDefaultConfig() component.ExporterConfig { func createLogsExporter( _ context.Context, params component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.LogsExporter, error) { exp, err := newLogsExporter(cfg.(*Config), params) if err != nil { @@ -79,7 +79,7 @@ func createLogsExporter( func createMetricsExporter( _ context.Context, params component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.MetricsExporter, error) { exp, err := newMetricsExporter(cfg.(*Config), params) if err != nil { diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index 110e3a204e40..1f396c6a286b 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -4,10 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 ) @@ -35,7 +35,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index bf0af1c48289..612d4fe3c8a9 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -297,16 +297,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/exporter/tanzuobservabilityexporter/factory.go b/exporter/tanzuobservabilityexporter/factory.go index 862524c3c913..b8911fecb4da 100644 --- a/exporter/tanzuobservabilityexporter/factory.go +++ b/exporter/tanzuobservabilityexporter/factory.go @@ -39,7 +39,7 @@ func NewFactory() component.ExporterFactory { ) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(exporterType)), QueueSettings: exporterhelper.NewDefaultQueueSettings(), @@ -52,7 +52,7 @@ func createDefaultConfig() component.ExporterConfig { func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.TracesExporter, error) { exp, err := newTracesExporter(set, cfg) if err != nil { @@ -78,7 +78,7 @@ func createTracesExporter( func createMetricsExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.MetricsExporter, error) { tobsCfg, ok := cfg.(*Config) if !ok { diff --git a/exporter/tanzuobservabilityexporter/go.mod b/exporter/tanzuobservabilityexporter/go.mod index 85fe7565ec4f..225b6533851b 100644 --- a/exporter/tanzuobservabilityexporter/go.mod +++ b/exporter/tanzuobservabilityexporter/go.mod @@ -7,10 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 github.com/wavefronthq/wavefront-sdk-go v0.10.4 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -61,9 +61,9 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/exporter/tanzuobservabilityexporter/go.sum b/exporter/tanzuobservabilityexporter/go.sum index e492896573e6..19d710dfdbec 100644 --- a/exporter/tanzuobservabilityexporter/go.sum +++ b/exporter/tanzuobservabilityexporter/go.sum @@ -411,21 +411,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/exporter/tanzuobservabilityexporter/metrics_exporter.go b/exporter/tanzuobservabilityexporter/metrics_exporter.go index 521462c59722..b6c26873bd7f 100644 --- a/exporter/tanzuobservabilityexporter/metrics_exporter.go +++ b/exporter/tanzuobservabilityexporter/metrics_exporter.go @@ -52,7 +52,7 @@ func createMetricsConsumer(config MetricsConfig, settings component.TelemetrySet type metricsConsumerCreator func(config MetricsConfig, settings component.TelemetrySettings, otelVersion string) ( *metricsConsumer, error) -func newMetricsExporter(settings component.ExporterCreateSettings, c component.ExporterConfig, creator metricsConsumerCreator) (*metricsExporter, error) { +func newMetricsExporter(settings component.ExporterCreateSettings, c component.Config, creator metricsConsumerCreator) (*metricsExporter, error) { cfg, ok := c.(*Config) if !ok { return nil, fmt.Errorf("invalid config: %#v", c) diff --git a/exporter/tanzuobservabilityexporter/trace_exporter.go b/exporter/tanzuobservabilityexporter/trace_exporter.go index c834aefa15cf..f94cf845fa09 100644 --- a/exporter/tanzuobservabilityexporter/trace_exporter.go +++ b/exporter/tanzuobservabilityexporter/trace_exporter.go @@ -63,7 +63,7 @@ type tracesExporter struct { logger *zap.Logger } -func newTracesExporter(settings component.ExporterCreateSettings, c component.ExporterConfig) (*tracesExporter, error) { +func newTracesExporter(settings component.ExporterCreateSettings, c component.Config) (*tracesExporter, error) { cfg, ok := c.(*Config) if !ok { return nil, fmt.Errorf("invalid config: %#v", c) diff --git a/exporter/tencentcloudlogserviceexporter/config.go b/exporter/tencentcloudlogserviceexporter/config.go index 553fb9fdc905..04171d643b6a 100644 --- a/exporter/tencentcloudlogserviceexporter/config.go +++ b/exporter/tencentcloudlogserviceexporter/config.go @@ -38,7 +38,7 @@ type Config struct { SecretKey string `mapstructure:"secret_key"` } -var _ component.ExporterConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/tencentcloudlogserviceexporter/config_test.go b/exporter/tencentcloudlogserviceexporter/config_test.go index 1872db12ecf0..f25e9b286249 100644 --- a/exporter/tencentcloudlogserviceexporter/config_test.go +++ b/exporter/tencentcloudlogserviceexporter/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, "2"), @@ -55,7 +55,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/tencentcloudlogserviceexporter/factory.go b/exporter/tencentcloudlogserviceexporter/factory.go index 0282b1035298..be35740af1b5 100644 --- a/exporter/tencentcloudlogserviceexporter/factory.go +++ b/exporter/tencentcloudlogserviceexporter/factory.go @@ -37,7 +37,7 @@ func NewFactory() component.ExporterFactory { } // CreateDefaultConfig creates the default configuration for exporter. -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), } @@ -46,7 +46,7 @@ func createDefaultConfig() component.ExporterConfig { func createLogsExporter( _ context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (exp component.LogsExporter, err error) { return newLogsExporter(set, cfg) } diff --git a/exporter/tencentcloudlogserviceexporter/go.mod b/exporter/tencentcloudlogserviceexporter/go.mod index d020043a7437..bb5316a098d9 100644 --- a/exporter/tencentcloudlogserviceexporter/go.mod +++ b/exporter/tencentcloudlogserviceexporter/go.mod @@ -7,10 +7,10 @@ require ( github.com/pierrec/lz4 v2.6.1+incompatible github.com/stretchr/testify v1.8.1 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.532 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 ) @@ -30,8 +30,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/exporter/tencentcloudlogserviceexporter/go.sum b/exporter/tencentcloudlogserviceexporter/go.sum index 1cd6388ca4d0..008dc1911636 100644 --- a/exporter/tencentcloudlogserviceexporter/go.sum +++ b/exporter/tencentcloudlogserviceexporter/go.sum @@ -282,18 +282,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/exporter/tencentcloudlogserviceexporter/logs_exporter.go b/exporter/tencentcloudlogserviceexporter/logs_exporter.go index 08d7da964a7e..d5811d82e506 100644 --- a/exporter/tencentcloudlogserviceexporter/logs_exporter.go +++ b/exporter/tencentcloudlogserviceexporter/logs_exporter.go @@ -24,7 +24,7 @@ import ( ) // newLogsExporter return a new LogService logs exporter. -func newLogsExporter(set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.LogsExporter, error) { +func newLogsExporter(set component.ExporterCreateSettings, cfg component.Config) (component.LogsExporter, error) { l := &logServiceLogsSender{ logger: set.Logger, } diff --git a/exporter/zipkinexporter/config.go b/exporter/zipkinexporter/config.go index 988b2b9f9610..53d31a91ac2d 100644 --- a/exporter/zipkinexporter/config.go +++ b/exporter/zipkinexporter/config.go @@ -36,7 +36,7 @@ type Config struct { DefaultServiceName string `mapstructure:"default_service_name"` } -var _ component.ExporterConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { diff --git a/exporter/zipkinexporter/config_test.go b/exporter/zipkinexporter/config_test.go index d0b2ef2aa5f7..8cb693ecf1e6 100644 --- a/exporter/zipkinexporter/config_test.go +++ b/exporter/zipkinexporter/config_test.go @@ -40,7 +40,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExporterConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -79,7 +79,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExporterConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/exporter/zipkinexporter/factory.go b/exporter/zipkinexporter/factory.go index 71e7f7ee324a..9bd21c63446c 100644 --- a/exporter/zipkinexporter/factory.go +++ b/exporter/zipkinexporter/factory.go @@ -46,7 +46,7 @@ func NewFactory() component.ExporterFactory { component.WithTracesExporter(createTracesExporter, stability)) } -func createDefaultConfig() component.ExporterConfig { +func createDefaultConfig() component.Config { return &Config{ ExporterSettings: config.NewExporterSettings(component.NewID(typeStr)), RetrySettings: exporterhelper.NewDefaultRetrySettings(), @@ -64,7 +64,7 @@ func createDefaultConfig() component.ExporterConfig { func createTracesExporter( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.TracesExporter, error) { zc := cfg.(*Config) diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index cbb3b77582ab..c5802d6be5bb 100644 --- a/exporter/zipkinexporter/go.mod +++ b/exporter/zipkinexporter/go.mod @@ -8,10 +8,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.66.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -40,8 +40,8 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/exporter/zipkinexporter/go.sum b/exporter/zipkinexporter/go.sum index e8903e1c442b..33cc845d77db 100644 --- a/exporter/zipkinexporter/go.sum +++ b/exporter/zipkinexporter/go.sum @@ -298,18 +298,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/extension/asapauthextension/config_test.go b/extension/asapauthextension/config_test.go index 59615120133c..d5bb14a3643c 100644 --- a/extension/asapauthextension/config_test.go +++ b/extension/asapauthextension/config_test.go @@ -40,7 +40,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExtensionConfig + expected component.Config expectedErr error }{ { @@ -79,7 +79,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expectedErr != nil { assert.ErrorIs(t, component.ValidateConfig(cfg), tt.expectedErr) return diff --git a/extension/asapauthextension/factory.go b/extension/asapauthextension/factory.go index 4034064f3b47..46a26f35150d 100644 --- a/extension/asapauthextension/factory.go +++ b/extension/asapauthextension/factory.go @@ -36,11 +36,11 @@ func NewFactory() component.ExtensionFactory { ) } -func createExtension(_ context.Context, _ component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { +func createExtension(_ context.Context, _ component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { return createASAPClientAuthenticator(cfg.(*Config)) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } diff --git a/extension/asapauthextension/go.mod b/extension/asapauthextension/go.mod index 6357b412d4fe..d5b260154466 100644 --- a/extension/asapauthextension/go.mod +++ b/extension/asapauthextension/go.mod @@ -6,8 +6,8 @@ require ( bitbucket.org/atlassian/go-asap/v2 v2.6.0 github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.51.0 ) @@ -30,9 +30,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/vincent-petithory/dataurl v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/asapauthextension/go.sum b/extension/asapauthextension/go.sum index 39caa039a896..c223338d4746 100644 --- a/extension/asapauthextension/go.sum +++ b/extension/asapauthextension/go.sum @@ -276,16 +276,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/awsproxy/config_test.go b/extension/awsproxy/config_test.go index 98b490e257b6..b13bd2ddba9b 100644 --- a/extension/awsproxy/config_test.go +++ b/extension/awsproxy/config_test.go @@ -34,7 +34,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExtensionConfig + expected component.Config }{ { id: component.NewID(typeStr), @@ -68,7 +68,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/extension/awsproxy/factory.go b/extension/awsproxy/factory.go index 63e8f181bfaa..99df00b130db 100644 --- a/extension/awsproxy/factory.go +++ b/extension/awsproxy/factory.go @@ -42,7 +42,7 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), ProxyConfig: proxy.Config{ @@ -56,6 +56,6 @@ func createDefaultConfig() component.ExtensionConfig { } } -func createExtension(_ context.Context, params component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { +func createExtension(_ context.Context, params component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { return newXrayProxy(cfg.(*Config), params.Logger) } diff --git a/extension/awsproxy/go.mod b/extension/awsproxy/go.mod index 5252ae35fe9d..0fd98a59eed3 100644 --- a/extension/awsproxy/go.mod +++ b/extension/awsproxy/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -26,9 +26,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/awsproxy/go.sum b/extension/awsproxy/go.sum index e2e39410f2aa..fa97bbfce1ab 100644 --- a/extension/awsproxy/go.sum +++ b/extension/awsproxy/go.sum @@ -265,16 +265,16 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/basicauthextension/config_test.go b/extension/basicauthextension/config_test.go index a33e03705845..b8fcc498d1fd 100644 --- a/extension/basicauthextension/config_test.go +++ b/extension/basicauthextension/config_test.go @@ -30,7 +30,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExtensionConfig + expected component.Config expectedErr bool }{ { @@ -69,7 +69,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expectedErr { assert.Error(t, component.ValidateConfig(cfg)) return diff --git a/extension/basicauthextension/factory.go b/extension/basicauthextension/factory.go index bed825b915c4..28ace2fc7f71 100644 --- a/extension/basicauthextension/factory.go +++ b/extension/basicauthextension/factory.go @@ -35,13 +35,13 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } } -func createExtension(_ context.Context, _ component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { +func createExtension(_ context.Context, _ component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { // check if config is a server auth(Htpasswd should be set) if cfg.(*Config).Htpasswd != nil { return newServerAuthExtension(cfg.(*Config)) diff --git a/extension/basicauthextension/go.mod b/extension/basicauthextension/go.mod index fdaca182f1e4..fbc27d4cae96 100644 --- a/extension/basicauthextension/go.mod +++ b/extension/basicauthextension/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 github.com/tg123/go-htpasswd v1.2.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 google.golang.org/grpc v1.51.0 ) @@ -26,9 +26,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/basicauthextension/go.sum b/extension/basicauthextension/go.sum index 9e8f7176a893..d2becf03d5ff 100644 --- a/extension/basicauthextension/go.sum +++ b/extension/basicauthextension/go.sum @@ -269,16 +269,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/bearertokenauthextension/config.go b/extension/bearertokenauthextension/config.go index 67085723501a..df95a36c2e5b 100644 --- a/extension/bearertokenauthextension/config.go +++ b/extension/bearertokenauthextension/config.go @@ -35,7 +35,7 @@ type Config struct { Filename string `mapstructure:"filename,omitempty"` } -var _ component.ExtensionConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) var errNoTokenProvided = errors.New("no bearer token provided") // Validate checks if the extension configuration is valid diff --git a/extension/bearertokenauthextension/config_test.go b/extension/bearertokenauthextension/config_test.go index 903909054788..9b1bba471816 100644 --- a/extension/bearertokenauthextension/config_test.go +++ b/extension/bearertokenauthextension/config_test.go @@ -30,7 +30,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExtensionConfig + expected component.Config expectedErr bool }{ { @@ -62,7 +62,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expectedErr { assert.Error(t, component.ValidateConfig(cfg)) return diff --git a/extension/bearertokenauthextension/factory.go b/extension/bearertokenauthextension/factory.go index 4be5739d530d..058703cc19d4 100644 --- a/extension/bearertokenauthextension/factory.go +++ b/extension/bearertokenauthextension/factory.go @@ -38,13 +38,13 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Scheme: defaultScheme, } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { +func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { return newBearerTokenAuth(cfg.(*Config), set.Logger), nil } diff --git a/extension/bearertokenauthextension/go.mod b/extension/bearertokenauthextension/go.mod index f92152449926..ab58c5d7a8a9 100644 --- a/extension/bearertokenauthextension/go.mod +++ b/extension/bearertokenauthextension/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/fsnotify/fsnotify v1.6.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.51.0 ) @@ -26,9 +26,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/bearertokenauthextension/go.sum b/extension/bearertokenauthextension/go.sum index c914bde3b4f8..5eb94e226dc3 100644 --- a/extension/bearertokenauthextension/go.sum +++ b/extension/bearertokenauthextension/go.sum @@ -266,16 +266,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/fluentbitextension/config_test.go b/extension/fluentbitextension/config_test.go index 958054224e23..152212451b25 100644 --- a/extension/fluentbitextension/config_test.go +++ b/extension/fluentbitextension/config_test.go @@ -30,7 +30,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExtensionConfig + expected component.Config }{ { id: component.NewID(typeStr), @@ -52,7 +52,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/extension/fluentbitextension/factory.go b/extension/fluentbitextension/factory.go index 31b794235edb..903ee75d498b 100644 --- a/extension/fluentbitextension/factory.go +++ b/extension/fluentbitextension/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } @@ -52,7 +52,7 @@ func logDeprecation(logger *zap.Logger) { }) } -func createExtension(_ context.Context, params component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { +func createExtension(_ context.Context, params component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { logDeprecation(params.Logger) config := cfg.(*Config) return newProcessManager(config, params.Logger), nil diff --git a/extension/fluentbitextension/go.mod b/extension/fluentbitextension/go.mod index 535f8b543e8c..18fd61375308 100644 --- a/extension/fluentbitextension/go.mod +++ b/extension/fluentbitextension/go.mod @@ -7,8 +7,8 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -32,9 +32,9 @@ require ( github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/fluentbitextension/go.sum b/extension/fluentbitextension/go.sum index 18ba5a2ca62d..bb2e6c642e59 100644 --- a/extension/fluentbitextension/go.sum +++ b/extension/fluentbitextension/go.sum @@ -280,16 +280,16 @@ github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/headerssetterextension/config_test.go b/extension/headerssetterextension/config_test.go index aae874c42a60..ade9de666336 100644 --- a/extension/headerssetterextension/config_test.go +++ b/extension/headerssetterextension/config_test.go @@ -30,7 +30,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExtensionConfig + expected component.Config }{ { id: component.NewID(typeStr), @@ -63,7 +63,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, tt.expected, cfg) }) } diff --git a/extension/headerssetterextension/factory.go b/extension/headerssetterextension/factory.go index b5cdd9a150cb..3d6d5015657f 100644 --- a/extension/headerssetterextension/factory.go +++ b/extension/headerssetterextension/factory.go @@ -35,7 +35,7 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } @@ -44,7 +44,7 @@ func createDefaultConfig() component.ExtensionConfig { func createExtension( _ context.Context, _ component.ExtensionCreateSettings, - cfg component.ExtensionConfig, + cfg component.Config, ) (component.Extension, error) { return newHeadersSetterExtension(cfg.(*Config)) } diff --git a/extension/headerssetterextension/go.mod b/extension/headerssetterextension/go.mod index 03c2b67053a4..58991e67cac5 100644 --- a/extension/headerssetterextension/go.mod +++ b/extension/headerssetterextension/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 google.golang.org/grpc v1.51.0 ) @@ -21,9 +21,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/headerssetterextension/go.sum b/extension/headerssetterextension/go.sum index a75ae5a5ff53..bb7d1973a697 100644 --- a/extension/headerssetterextension/go.sum +++ b/extension/headerssetterextension/go.sum @@ -257,16 +257,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/healthcheckextension/config.go b/extension/healthcheckextension/config.go index 2acd9f23081b..796c6df9b429 100644 --- a/extension/healthcheckextension/config.go +++ b/extension/healthcheckextension/config.go @@ -38,7 +38,7 @@ type Config struct { CheckCollectorPipeline checkCollectorPipelineSettings `mapstructure:"check_collector_pipeline"` } -var _ component.ExtensionConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) var ( errNoEndpointProvided = errors.New("bad config: endpoint must be specified") errInvalidExporterFailureThresholdProvided = errors.New("bad config: exporter_failure_threshold expects a positive number") diff --git a/extension/healthcheckextension/config_test.go b/extension/healthcheckextension/config_test.go index 147011afa37f..a93284f431d6 100644 --- a/extension/healthcheckextension/config_test.go +++ b/extension/healthcheckextension/config_test.go @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExtensionConfig + expected component.Config expectedErr error }{ { @@ -78,7 +78,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expectedErr != nil { assert.ErrorIs(t, component.ValidateConfig(cfg), tt.expectedErr) return diff --git a/extension/healthcheckextension/factory.go b/extension/healthcheckextension/factory.go index cd5f24552139..ef669bed109b 100644 --- a/extension/healthcheckextension/factory.go +++ b/extension/healthcheckextension/factory.go @@ -41,7 +41,7 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ @@ -52,7 +52,7 @@ func createDefaultConfig() component.ExtensionConfig { } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { +func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { config := cfg.(*Config) return newServer(*config, set.TelemetrySettings), nil diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index 1e69e7344390..6bc1db622889 100644 --- a/extension/healthcheckextension/go.mod +++ b/extension/healthcheckextension/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -30,9 +30,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/extension/healthcheckextension/go.sum b/extension/healthcheckextension/go.sum index 0e2ff892ec7d..938eb1b6d447 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -272,16 +272,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/extension/httpforwarder/config_test.go b/extension/httpforwarder/config_test.go index f02afab2d0d6..2502227d6eb9 100644 --- a/extension/httpforwarder/config_test.go +++ b/extension/httpforwarder/config_test.go @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExtensionConfig + expected component.Config }{ { id: component.NewID(typeStr), @@ -63,7 +63,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) diff --git a/extension/httpforwarder/factory.go b/extension/httpforwarder/factory.go index 8b67759a1b89..ba614a180c49 100644 --- a/extension/httpforwarder/factory.go +++ b/extension/httpforwarder/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ExtensionFactory { component.StabilityLevelUnmaintained) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Ingress: confighttp.HTTPServerSettings{ @@ -55,7 +55,7 @@ func createDefaultConfig() component.ExtensionConfig { func createExtension( _ context.Context, params component.ExtensionCreateSettings, - cfg component.ExtensionConfig, + cfg component.Config, ) (component.Extension, error) { return newHTTPForwarder(cfg.(*Config), params.TelemetrySettings) } diff --git a/extension/httpforwarder/go.mod b/extension/httpforwarder/go.mod index cb7f9b7f4247..08f2e288dc1a 100644 --- a/extension/httpforwarder/go.mod +++ b/extension/httpforwarder/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -32,9 +32,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/extension/httpforwarder/go.sum b/extension/httpforwarder/go.sum index 75a0fdf06442..055dd6856c09 100644 --- a/extension/httpforwarder/go.sum +++ b/extension/httpforwarder/go.sum @@ -279,16 +279,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/extension/jaegerremotesampling/config.go b/extension/jaegerremotesampling/config.go index cfff8bd5709b..95d1977c2fee 100644 --- a/extension/jaegerremotesampling/config.go +++ b/extension/jaegerremotesampling/config.go @@ -52,7 +52,7 @@ type Source struct { ReloadInterval time.Duration `mapstructure:"reload_interval"` } -var _ component.ExtensionConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the extension configuration is valid func (cfg *Config) Validate() error { diff --git a/extension/jaegerremotesampling/config_test.go b/extension/jaegerremotesampling/config_test.go index 2c3d0ea31564..c5f438b544c0 100644 --- a/extension/jaegerremotesampling/config_test.go +++ b/extension/jaegerremotesampling/config_test.go @@ -34,7 +34,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExtensionConfig + expected component.Config }{ { id: component.NewID(typeStr), @@ -76,7 +76,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) }) diff --git a/extension/jaegerremotesampling/factory.go b/extension/jaegerremotesampling/factory.go index 59fa7492b1eb..14bb39f56fee 100644 --- a/extension/jaegerremotesampling/factory.go +++ b/extension/jaegerremotesampling/factory.go @@ -39,7 +39,7 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), HTTPServerSettings: &confighttp.HTTPServerSettings{ @@ -55,6 +55,6 @@ func createDefaultConfig() component.ExtensionConfig { } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { +func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { return newExtension(cfg.(*Config), set.TelemetrySettings), nil } diff --git a/extension/jaegerremotesampling/go.mod b/extension/jaegerremotesampling/go.mod index 98f1d3f19a51..47e13b1ef913 100644 --- a/extension/jaegerremotesampling/go.mod +++ b/extension/jaegerremotesampling/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.51.0 ) @@ -46,9 +46,9 @@ require ( github.com/subosito/gotenv v1.4.1 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/extension/jaegerremotesampling/go.sum b/extension/jaegerremotesampling/go.sum index df9d740c7cbf..771fe9e0c3e4 100644 --- a/extension/jaegerremotesampling/go.sum +++ b/extension/jaegerremotesampling/go.sum @@ -423,16 +423,16 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= diff --git a/extension/oauth2clientauthextension/config.go b/extension/oauth2clientauthextension/config.go index f1db49aa7ff4..51af9408d84d 100644 --- a/extension/oauth2clientauthextension/config.go +++ b/extension/oauth2clientauthextension/config.go @@ -62,7 +62,7 @@ type Config struct { Timeout time.Duration `mapstructure:"timeout,omitempty"` } -var _ component.ExtensionConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the extension configuration is valid func (cfg *Config) Validate() error { diff --git a/extension/oauth2clientauthextension/config_test.go b/extension/oauth2clientauthextension/config_test.go index 370e79a4ed25..aac9dacbf5c1 100644 --- a/extension/oauth2clientauthextension/config_test.go +++ b/extension/oauth2clientauthextension/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExtensionConfig + expected component.Config expectedErr error }{ { @@ -90,7 +90,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expectedErr != nil { assert.ErrorIs(t, component.ValidateConfig(cfg), tt.expectedErr) return diff --git a/extension/oauth2clientauthextension/factory.go b/extension/oauth2clientauthextension/factory.go index 57dd012c2b73..7485f546c98f 100644 --- a/extension/oauth2clientauthextension/factory.go +++ b/extension/oauth2clientauthextension/factory.go @@ -37,13 +37,13 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { +func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { ca, err := newClientAuthenticator(cfg.(*Config), set.Logger) if err != nil { return nil, err diff --git a/extension/oauth2clientauthextension/go.mod b/extension/oauth2clientauthextension/go.mod index bf1fd156713d..dd807d08daa8 100644 --- a/extension/oauth2clientauthextension/go.mod +++ b/extension/oauth2clientauthextension/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 @@ -34,9 +34,9 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/extension/oauth2clientauthextension/go.sum b/extension/oauth2clientauthextension/go.sum index 371585fffc87..3aba482a311b 100644 --- a/extension/oauth2clientauthextension/go.sum +++ b/extension/oauth2clientauthextension/go.sum @@ -274,16 +274,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/extension/observer/dockerobserver/config_test.go b/extension/observer/dockerobserver/config_test.go index 4426f95bf0e6..588187bebec1 100644 --- a/extension/observer/dockerobserver/config_test.go +++ b/extension/observer/dockerobserver/config_test.go @@ -31,7 +31,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExtensionConfig + expected component.Config }{ { id: component.NewID(typeStr), @@ -85,7 +85,7 @@ func loadConfig(t testing.TB, id component.ID) *Config { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) return cfg.(*Config) } diff --git a/extension/observer/dockerobserver/factory.go b/extension/observer/dockerobserver/factory.go index 96d38d0459a4..5b753b28912e 100644 --- a/extension/observer/dockerobserver/factory.go +++ b/extension/observer/dockerobserver/factory.go @@ -37,7 +37,7 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Endpoint: "unix:///var/run/docker.sock", @@ -50,7 +50,7 @@ func createDefaultConfig() component.ExtensionConfig { func createExtension( _ context.Context, settings component.ExtensionCreateSettings, - cfg component.ExtensionConfig, + cfg component.Config, ) (component.Extension, error) { config := cfg.(*Config) return newObserver(settings.Logger, config) diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod index cef9ddee15b2..1fc96ee18c74 100644 --- a/extension/observer/dockerobserver/go.mod +++ b/extension/observer/dockerobserver/go.mod @@ -10,8 +10,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -52,9 +52,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/observer/dockerobserver/go.sum b/extension/observer/dockerobserver/go.sum index c0c7252142f6..b267c1c34b32 100644 --- a/extension/observer/dockerobserver/go.sum +++ b/extension/observer/dockerobserver/go.sum @@ -813,16 +813,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/observer/ecsobserver/config_test.go b/extension/observer/ecsobserver/config_test.go index 90cb678e7677..0e4410caf7c0 100644 --- a/extension/observer/ecsobserver/config_test.go +++ b/extension/observer/ecsobserver/config_test.go @@ -29,7 +29,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExtensionConfig + expected component.Config expectedErr bool }{ { @@ -38,7 +38,7 @@ func TestLoadConfig(t *testing.T) { }, { id: component.NewIDWithName(typeStr, "1"), - expected: func() component.ExtensionConfig { + expected: func() component.Config { cfg := DefaultConfig() cfg.ClusterRegion = "us-west-2" cfg.JobLabelName = "my_prometheus_job" @@ -51,7 +51,7 @@ func TestLoadConfig(t *testing.T) { }, { id: component.NewIDWithName(typeStr, "3"), - expected: func() component.ExtensionConfig { + expected: func() component.Config { cfg := DefaultConfig() cfg.DockerLabels = []DockerLabelConfig{ { @@ -74,7 +74,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expectedErr { assert.Error(t, component.ValidateConfig(cfg)) return diff --git a/extension/observer/ecsobserver/factory.go b/extension/observer/ecsobserver/factory.go index 5d53e505c03e..2133eeb6e966 100644 --- a/extension/observer/ecsobserver/factory.go +++ b/extension/observer/ecsobserver/factory.go @@ -35,12 +35,12 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { cfg := DefaultConfig() return &cfg } -func createExtension(ctx context.Context, params component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { +func createExtension(ctx context.Context, params component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { sdCfg := cfg.(*Config) fetcher, err := newTaskFetcherFromConfig(*sdCfg, params.Logger) if err != nil { diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod index 13c5bde9f11e..964d88c8c703 100644 --- a/extension/observer/ecsobserver/go.mod +++ b/extension/observer/ecsobserver/go.mod @@ -6,8 +6,8 @@ require ( github.com/aws/aws-sdk-go v1.44.145 github.com/hashicorp/golang-lru v0.5.4 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 gopkg.in/yaml.v2 v2.4.0 @@ -29,9 +29,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/observer/ecsobserver/go.sum b/extension/observer/ecsobserver/go.sum index cb0ff7bf4067..241440995598 100644 --- a/extension/observer/ecsobserver/go.sum +++ b/extension/observer/ecsobserver/go.sum @@ -272,16 +272,16 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/observer/ecstaskobserver/config_test.go b/extension/observer/ecstaskobserver/config_test.go index c6bd1b6eef5a..5a16d59ae296 100644 --- a/extension/observer/ecstaskobserver/config_test.go +++ b/extension/observer/ecstaskobserver/config_test.go @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExtensionConfig + expected component.Config expectedErr string }{ { @@ -71,7 +71,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expectedErr != "" { assert.EqualError(t, component.ValidateConfig(cfg), tt.expectedErr) return diff --git a/extension/observer/ecstaskobserver/factory.go b/extension/observer/ecstaskobserver/factory.go index 46a524490226..b6994d340b61 100644 --- a/extension/observer/ecstaskobserver/factory.go +++ b/extension/observer/ecstaskobserver/factory.go @@ -39,7 +39,7 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { cfg := defaultConfig() return &cfg } @@ -52,7 +52,7 @@ type extension struct { func createExtension( _ context.Context, params component.ExtensionCreateSettings, - cfg component.ExtensionConfig, + cfg component.Config, ) (component.Extension, error) { obsCfg := cfg.(*Config) diff --git a/extension/observer/ecstaskobserver/go.mod b/extension/observer/ecstaskobserver/go.mod index 16d785e91a19..41777c30bdef 100644 --- a/extension/observer/ecstaskobserver/go.mod +++ b/extension/observer/ecstaskobserver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -30,9 +30,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/extension/observer/ecstaskobserver/go.sum b/extension/observer/ecstaskobserver/go.sum index 623be136dded..1180e571aac3 100644 --- a/extension/observer/ecstaskobserver/go.sum +++ b/extension/observer/ecstaskobserver/go.sum @@ -272,16 +272,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/extension/observer/hostobserver/config_test.go b/extension/observer/hostobserver/config_test.go index 7e4bda11d604..a8634e24527f 100644 --- a/extension/observer/hostobserver/config_test.go +++ b/extension/observer/hostobserver/config_test.go @@ -31,7 +31,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExtensionConfig + expected component.Config }{ { id: component.NewID(typeStr), @@ -53,7 +53,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/extension/observer/hostobserver/factory.go b/extension/observer/hostobserver/factory.go index e5426b1de42f..7222d3d036dd 100644 --- a/extension/observer/hostobserver/factory.go +++ b/extension/observer/hostobserver/factory.go @@ -39,7 +39,7 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), RefreshInterval: defaultCollectionInterval * time.Second, @@ -49,7 +49,7 @@ func createDefaultConfig() component.ExtensionConfig { func createExtension( _ context.Context, params component.ExtensionCreateSettings, - cfg component.ExtensionConfig, + cfg component.Config, ) (component.Extension, error) { config := cfg.(*Config) return newObserver(params.Logger, config) diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index 181391ae1c7b..6da7f1626a48 100644 --- a/extension/observer/hostobserver/go.mod +++ b/extension/observer/hostobserver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.66.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -33,9 +33,9 @@ require ( github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index 47d5fd2fc827..45dcc712857f 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -282,16 +282,16 @@ github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/observer/k8sobserver/config.go b/extension/observer/k8sobserver/config.go index c8203184818b..3ca25f108580 100644 --- a/extension/observer/k8sobserver/config.go +++ b/extension/observer/k8sobserver/config.go @@ -55,5 +55,5 @@ func (cfg *Config) Validate() error { if !cfg.ObservePods && !cfg.ObserveNodes { return fmt.Errorf("one of observe_pods and observe_nodes must be true") } - return cfg.APIConfig.Validate() + return nil } diff --git a/extension/observer/k8sobserver/config_test.go b/extension/observer/k8sobserver/config_test.go index 9fbb25d3d47f..ac5e00f3bce3 100644 --- a/extension/observer/k8sobserver/config_test.go +++ b/extension/observer/k8sobserver/config_test.go @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExtensionConfig + expected component.Config expectedErr string }{ { @@ -75,7 +75,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expectedErr != "" { assert.EqualError(t, component.ValidateConfig(cfg), tt.expectedErr) return diff --git a/extension/observer/k8sobserver/factory.go b/extension/observer/k8sobserver/factory.go index 9006774f3501..bf9e6a0ab841 100644 --- a/extension/observer/k8sobserver/factory.go +++ b/extension/observer/k8sobserver/factory.go @@ -39,7 +39,7 @@ func NewFactory() component.ExtensionFactory { } // CreateDefaultConfig creates the default configuration for the extension. -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeServiceAccount}, @@ -52,7 +52,7 @@ func createDefaultConfig() component.ExtensionConfig { func createExtension( ctx context.Context, params component.ExtensionCreateSettings, - cfg component.ExtensionConfig, + cfg component.Config, ) (component.Extension, error) { return newObserver(cfg.(*Config), params.TelemetrySettings) } diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index c22ae79b42d2..32b73a25acf3 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 @@ -46,9 +46,9 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index 0da88612c80f..cf18de6811f3 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -432,16 +432,16 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/oidcauthextension/factory.go b/extension/oidcauthextension/factory.go index 380bbbd90686..a0f9ce711b46 100644 --- a/extension/oidcauthextension/factory.go +++ b/extension/oidcauthextension/factory.go @@ -38,13 +38,13 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Attribute: defaultAttribute, } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { +func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { return newExtension(cfg.(*Config), set.Logger) } diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod index 852c4b3129de..2d3e70d94b8f 100644 --- a/extension/oidcauthextension/go.mod +++ b/extension/oidcauthextension/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/coreos/go-oidc v2.2.1+incompatible github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -26,9 +26,9 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/oidcauthextension/go.sum b/extension/oidcauthextension/go.sum index 0b2a9b590b91..0f260586dc8b 100644 --- a/extension/oidcauthextension/go.sum +++ b/extension/oidcauthextension/go.sum @@ -345,16 +345,16 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/pprofextension/config.go b/extension/pprofextension/config.go index e742d00880d3..49ccb56239ca 100644 --- a/extension/pprofextension/config.go +++ b/extension/pprofextension/config.go @@ -44,7 +44,7 @@ type Config struct { SaveToFile string `mapstructure:"save_to_file"` } -var _ component.ExtensionConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the extension configuration is valid func (cfg *Config) Validate() error { diff --git a/extension/pprofextension/config_test.go b/extension/pprofextension/config_test.go index 5f4d8c532e70..e8b30a5f03fa 100644 --- a/extension/pprofextension/config_test.go +++ b/extension/pprofextension/config_test.go @@ -31,7 +31,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExtensionConfig + expected component.Config }{ { id: component.NewID(typeStr), @@ -55,7 +55,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/extension/pprofextension/factory.go b/extension/pprofextension/factory.go index a68330008f7e..1fd4a3369516 100644 --- a/extension/pprofextension/factory.go +++ b/extension/pprofextension/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), TCPAddr: confignet.TCPAddr{ @@ -49,7 +49,7 @@ func createDefaultConfig() component.ExtensionConfig { } } -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { +func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { config := cfg.(*Config) if config.TCPAddr.Endpoint == "" { return nil, errors.New("\"endpoint\" is required when using the \"pprof\" extension") diff --git a/extension/pprofextension/go.mod b/extension/pprofextension/go.mod index 1ef2beefeb29..2a0b83638afa 100644 --- a/extension/pprofextension/go.mod +++ b/extension/pprofextension/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 ) @@ -27,9 +27,9 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/pprofextension/go.sum b/extension/pprofextension/go.sum index 249723cf9e45..0bfcf69c6dbd 100644 --- a/extension/pprofextension/go.sum +++ b/extension/pprofextension/go.sum @@ -266,16 +266,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/sigv4authextension/config.go b/extension/sigv4authextension/config.go index 0c10f79db62e..dad500cf8170 100644 --- a/extension/sigv4authextension/config.go +++ b/extension/sigv4authextension/config.go @@ -38,8 +38,8 @@ type AssumeRole struct { STSRegion string `mapstructure:"sts_region,omitempty"` } -// compile time check that the Config struct satisfies the component.ExtensionConfig interface -var _ component.ExtensionConfig = (*Config)(nil) +// compile time check that the Config struct satisfies the component.Config interface +var _ component.Config = (*Config)(nil) // Validate checks that the configuration is valid. // We aim to catch most errors here to ensure that we diff --git a/extension/sigv4authextension/config_test.go b/extension/sigv4authextension/config_test.go index 9712a21c5c78..730a293fae2d 100644 --- a/extension/sigv4authextension/config_test.go +++ b/extension/sigv4authextension/config_test.go @@ -39,7 +39,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(component.NewID(typeStr).String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, &Config{ @@ -62,6 +62,6 @@ func TestLoadConfigError(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(component.NewIDWithName(typeStr, "missing_credentials").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Error(t, component.ValidateConfig(cfg)) } diff --git a/extension/sigv4authextension/factory.go b/extension/sigv4authextension/factory.go index 54102b7435f3..a5557ff57d22 100644 --- a/extension/sigv4authextension/factory.go +++ b/extension/sigv4authextension/factory.go @@ -35,14 +35,14 @@ func NewFactory() component.ExtensionFactory { // createDefaultConfig() creates a Config struct with default values. // We only set the ID here. -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } } // createExtension() calls newSigv4Extension() in extension.go to create the extension. -func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.ExtensionConfig) (component.Extension, error) { +func createExtension(_ context.Context, set component.ExtensionCreateSettings, cfg component.Config) (component.Extension, error) { awsSDKInfo := fmt.Sprintf("%s/%s", aws.SDKName, aws.SDKVersion) return newSigv4Extension(cfg.(*Config), awsSDKInfo, set.Logger), nil } diff --git a/extension/sigv4authextension/go.mod b/extension/sigv4authextension/go.mod index 4fd821acb236..8849044af5bf 100644 --- a/extension/sigv4authextension/go.mod +++ b/extension/sigv4authextension/go.mod @@ -8,8 +8,8 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.13.0 github.com/aws/aws-sdk-go-v2/service/sts v1.17.2 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.51.0 ) @@ -34,9 +34,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/sigv4authextension/go.sum b/extension/sigv4authextension/go.sum index 098677c07b2e..ae03394fab75 100644 --- a/extension/sigv4authextension/go.sum +++ b/extension/sigv4authextension/go.sum @@ -282,16 +282,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/extension/storage/dbstorage/factory.go b/extension/storage/dbstorage/factory.go index e6e32c36284f..ca0944edb6da 100644 --- a/extension/storage/dbstorage/factory.go +++ b/extension/storage/dbstorage/factory.go @@ -34,7 +34,7 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), } @@ -43,7 +43,7 @@ func createDefaultConfig() component.ExtensionConfig { func createExtension( _ context.Context, params component.ExtensionCreateSettings, - cfg component.ExtensionConfig, + cfg component.Config, ) (component.Extension, error) { return newDBStorage(params.Logger, cfg.(*Config)) } diff --git a/extension/storage/filestorage/config_test.go b/extension/storage/filestorage/config_test.go index fd25bc01ba85..be32d6873471 100644 --- a/extension/storage/filestorage/config_test.go +++ b/extension/storage/filestorage/config_test.go @@ -33,11 +33,11 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ExtensionConfig + expected component.Config }{ { id: component.NewID(typeStr), - expected: func() component.ExtensionConfig { + expected: func() component.Config { ret := NewFactory().CreateDefaultConfig() ret.(*Config).Directory = "." return ret @@ -69,7 +69,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalExtensionConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/extension/storage/filestorage/factory.go b/extension/storage/filestorage/factory.go index de72437201b1..564d02ae744f 100644 --- a/extension/storage/filestorage/factory.go +++ b/extension/storage/filestorage/factory.go @@ -44,7 +44,7 @@ func NewFactory() component.ExtensionFactory { ) } -func createDefaultConfig() component.ExtensionConfig { +func createDefaultConfig() component.Config { return &Config{ ExtensionSettings: config.NewExtensionSettings(component.NewID(typeStr)), Directory: getDefaultDirectory(), @@ -64,7 +64,7 @@ func createDefaultConfig() component.ExtensionConfig { func createExtension( _ context.Context, params component.ExtensionCreateSettings, - cfg component.ExtensionConfig, + cfg component.Config, ) (component.Extension, error) { return newLocalFileStorage(params.Logger, cfg.(*Config)) } diff --git a/extension/storage/go.mod b/extension/storage/go.mod index 871f460f68d3..c183d644f9a7 100644 --- a/extension/storage/go.mod +++ b/extension/storage/go.mod @@ -7,8 +7,8 @@ require ( github.com/mattn/go-sqlite3 v2.0.3+incompatible github.com/stretchr/testify v1.8.1 go.etcd.io/bbolt v1.3.6 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -34,9 +34,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/extension/storage/go.sum b/extension/storage/go.sum index adf0eab1786e..cd14175a1c5d 100644 --- a/extension/storage/go.sum +++ b/extension/storage/go.sum @@ -347,16 +347,16 @@ go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/go.mod b/go.mod index 88999d356497..ec30c2b81d3d 100644 --- a/go.mod +++ b/go.mod @@ -159,17 +159,17 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.66.0 github.com/prometheus/prometheus v1.8.2-0.20220303173753-edfe657b5405 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/exporter/loggingexporter v0.66.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.0 - go.opentelemetry.io/collector/extension/ballastextension v0.66.0 - go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 golang.org/x/sys v0.2.0 ) @@ -592,9 +592,9 @@ require ( go.mongodb.org/atlas v0.19.0 // indirect go.mongodb.org/mongo-driver v1.10.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect diff --git a/go.sum b/go.sum index b709dea1561d..eafd0b65d768 100644 --- a/go.sum +++ b/go.sum @@ -2344,50 +2344,50 @@ go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.64.1/go.mod h1:RxdEKzwxTEhBAgzC4wzyJEwSFgjWU73CHnLjKUKQDyo= go.opentelemetry.io/collector v0.65.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= go.opentelemetry.io/collector/component v0.65.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= go.opentelemetry.io/collector/consumer v0.65.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.0 h1:LLgWAS3zGce/H7UVB/EwPm49n3qNRbh/Gkd1IPORJDg= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.0/go.mod h1:X7fNHTbcgvOOio9QDEyVk0WbIm1JaVYby4z3VzsOc2k= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0 h1:uXNkGlAXHyvUZL51qsQR8hS8oSt80m1ncbqwXRRkJMk= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.0 h1:Nqopv2VdkjI/kCg8SsZYBD5R+Gd3OlM5lAZ2N+Exx60= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.0/go.mod h1:Gx9WIGE9pUv38Sm8IN0IPM7k+mX2hHGfRZI/65pOSIc= -go.opentelemetry.io/collector/extension/ballastextension v0.66.0 h1:oAEb4UBwNs5v9X83farWSVnxmjSiU5eHmWCU6agSVRE= -go.opentelemetry.io/collector/extension/ballastextension v0.66.0/go.mod h1:vjBno34PZB+byrW3QWzftLFqCI1G8PbgPrgPzpFXpQM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:kCxEnurhKpScV+wDU/7RDngmOFeqyEh7GZUqrBaYnUU= +go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:X7fNHTbcgvOOio9QDEyVk0WbIm1JaVYby4z3VzsOc2k= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:3+YgPEDEyNzwiI+V9J2YBVGyV9Qppu4VPbB3jHeN8Ns= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:KkI/to7/yvuL5zHzhviy7UXMZVZ7jbfnk+YCAwCiimA= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:Gx9WIGE9pUv38Sm8IN0IPM7k+mX2hHGfRZI/65pOSIc= +go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90 h1:JmfSDExgWNiFQJ4eF9UzjDaE9rfBhKxIu5khBbAScd0= +go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:vjBno34PZB+byrW3QWzftLFqCI1G8PbgPrgPzpFXpQM= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1/go.mod h1:XenhQAUbOHgqNq5YQ/vQIcDHRcPUaDgZQxDC2qoI4Bc= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90 h1:Hsvd2zNTCjHjYVsHt57zUgpKMrmESgndZItuuvvv2bA= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.64.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= go.opentelemetry.io/collector/pdata v0.65.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/collector/processor/batchprocessor v0.64.1/go.mod h1:qVl0+aYokPfiq5y+JVAvlII2rrUFBDEqqiDbTSnax78= go.opentelemetry.io/collector/processor/batchprocessor v0.65.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.0 h1:JLzuWcVrRGFyLUaE9u42ZdLNXNUpbLnEQg3w0ULeQG8= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.0/go.mod h1:KfHfOzND4tzQYewrYzi/NGzvOV3wR7jzWTkxSR00lRI= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:4+4M7itvIDswjFTjvVttC+XWy7eOU2lxjEBaUiq/MXk= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:KfHfOzND4tzQYewrYzi/NGzvOV3wR7jzWTkxSR00lRI= go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.1/go.mod h1:4rwNi9SeCKBP9XGLWNRFKPsWUV5NK4iqMvdj2WRMksQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0 h1:ZHEOeGOIYIDTKhI9xs30/obFfhUbb9b2+e/eahp1fJA= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 h1:/+HfaoVPSXgHUZOTZSSriuKOQi8L/rgyb7TTRx5jzoo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.64.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/collector/semconv v0.65.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= diff --git a/internal/aws/containerinsight/go.mod b/internal/aws/containerinsight/go.mod index 2b1ced9080b5..b874fb9f7fff 100644 --- a/internal/aws/containerinsight/go.mod +++ b/internal/aws/containerinsight/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) diff --git a/internal/aws/containerinsight/go.sum b/internal/aws/containerinsight/go.sum index a066bea5847b..d2a200bb404e 100644 --- a/internal/aws/containerinsight/go.sum +++ b/internal/aws/containerinsight/go.sum @@ -54,8 +54,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/aws/cwlogs/go.mod b/internal/aws/cwlogs/go.mod index 91b286086d8b..36c2a0fe9fad 100644 --- a/internal/aws/cwlogs/go.mod +++ b/internal/aws/cwlogs/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/aws/aws-sdk-go v1.44.145 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -26,10 +26,10 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.66.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/internal/aws/cwlogs/go.sum b/internal/aws/cwlogs/go.sum index bc84aff739b4..0cd276955d14 100644 --- a/internal/aws/cwlogs/go.sum +++ b/internal/aws/cwlogs/go.sum @@ -271,16 +271,16 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/internal/aws/ecsutil/go.mod b/internal/aws/ecsutil/go.mod index 8de2ed08a05b..6cc753f186ed 100644 --- a/internal/aws/ecsutil/go.mod +++ b/internal/aws/ecsutil/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -32,9 +32,9 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/internal/aws/ecsutil/go.sum b/internal/aws/ecsutil/go.sum index 75a0fdf06442..055dd6856c09 100644 --- a/internal/aws/ecsutil/go.sum +++ b/internal/aws/ecsutil/go.sum @@ -279,16 +279,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/internal/aws/proxy/go.mod b/internal/aws/proxy/go.mod index 19bbf8034606..a3c03fc78d63 100644 --- a/internal/aws/proxy/go.mod +++ b/internal/aws/proxy/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.44.145 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -15,7 +15,7 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/kr/pretty v0.3.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/internal/aws/proxy/go.sum b/internal/aws/proxy/go.sum index c24040186a05..c1855eb40dcf 100644 --- a/internal/aws/proxy/go.sum +++ b/internal/aws/proxy/go.sum @@ -32,10 +32,10 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/common/go.mod b/internal/common/go.mod index 0e6165ab69d0..7bc5f60e6c9b 100644 --- a/internal/common/go.mod +++ b/internal/common/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/featuregate v0.66.0 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) diff --git a/internal/common/go.sum b/internal/common/go.sum index 721576409b59..01530a35a558 100644 --- a/internal/common/go.sum +++ b/internal/common/go.sum @@ -23,8 +23,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/components/exporters_test.go b/internal/components/exporters_test.go index af4639ddf9d7..098238b6a398 100644 --- a/internal/components/exporters_test.go +++ b/internal/components/exporters_test.go @@ -88,7 +88,7 @@ func TestDefaultExporters(t *testing.T) { }{ { exporter: "file", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["file"].CreateDefaultConfig().(*fileexporter.Config) cfg.Path = filepath.Join(t.TempDir(), "random.file") return cfg @@ -96,7 +96,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "jaeger", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["jaeger"].CreateDefaultConfig().(*jaegerexporter.Config) cfg.Endpoint = endpoint return cfg @@ -104,7 +104,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "jaeger_thrift", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["jaeger_thrift"].CreateDefaultConfig().(*jaegerthrifthttpexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -112,7 +112,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "kafka", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["kafka"].CreateDefaultConfig().(*kafkaexporter.Config) cfg.Brokers = []string{"invalid:9092"} // this disables contacting the broker so we can successfully create the exporter @@ -126,7 +126,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "opencensus", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["opencensus"].CreateDefaultConfig().(*opencensusexporter.Config) cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ Endpoint: endpoint, @@ -136,7 +136,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "otlp", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["otlp"].CreateDefaultConfig().(*otlpexporter.Config) cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ Endpoint: endpoint, @@ -146,7 +146,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "otlphttp", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["otlphttp"].CreateDefaultConfig().(*otlphttpexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -154,7 +154,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "parquet", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["parquet"].CreateDefaultConfig().(*parquetexporter.Config) cfg.Path = t.TempDir() return cfg @@ -162,7 +162,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "prometheus", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["prometheus"].CreateDefaultConfig().(*prometheusexporter.Config) cfg.Endpoint = endpoint return cfg @@ -173,7 +173,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "pulsar", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["pulsar"].CreateDefaultConfig().(*pulsarexporter.Config) cfg.Endpoint = "unknown:6650" return cfg @@ -181,7 +181,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "sapm", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["sapm"].CreateDefaultConfig().(*sapmexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -189,7 +189,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "signalfx", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["signalfx"].CreateDefaultConfig().(*signalfxexporter.Config) cfg.AccessToken = "my_fake_token" cfg.IngestURL = "http://" + endpoint @@ -199,7 +199,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "splunk_hec", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["splunk_hec"].CreateDefaultConfig().(*splunkhecexporter.Config) cfg.Token = "my_fake_token" cfg.Endpoint = "http://" + endpoint @@ -208,7 +208,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "zipkin", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["zipkin"].CreateDefaultConfig().(*zipkinexporter.Config) cfg.Endpoint = endpoint return cfg @@ -216,7 +216,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "awskinesis", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["awskinesis"].CreateDefaultConfig().(*awskinesisexporter.Config) cfg.AWS.KinesisEndpoint = endpoint return cfg @@ -224,7 +224,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "alibabacloud_logservice", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["alibabacloud_logservice"].CreateDefaultConfig().(*alibabacloudlogserviceexporter.Config) cfg.Endpoint = "http://" + endpoint cfg.Project = "otel-testing" @@ -234,7 +234,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "awscloudwatch", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["awscloudwatch"].CreateDefaultConfig().(*awscloudwatchlogsexporter.Config) cfg.Endpoint = "http://" + endpoint cfg.Region = "local" @@ -243,7 +243,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "awsemf", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["awsemf"].CreateDefaultConfig().(*awsemfexporter.Config) cfg.Endpoint = "http://" + endpoint cfg.Region = "local" @@ -252,7 +252,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "awsxray", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["awsxray"].CreateDefaultConfig().(*awsxrayexporter.Config) cfg.Endpoint = "http://" + endpoint cfg.Region = "local" @@ -261,7 +261,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "azuredataexplorer", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["azuredataexplorer"].CreateDefaultConfig().(*azuredataexplorerexporter.Config) cfg.ClusterURI = "http://" + endpoint cfg.ApplicationID = "otel-app-id" @@ -272,7 +272,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "azuremonitor", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["azuremonitor"].CreateDefaultConfig().(*azuremonitorexporter.Config) cfg.Endpoint = "http://" + endpoint @@ -281,7 +281,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "carbon", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["carbon"].CreateDefaultConfig().(*carbonexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -289,7 +289,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "clickhouse", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["clickhouse"].CreateDefaultConfig().(*clickhouseexporter.Config) cfg.DSN = "clickhouse://" + endpoint return cfg @@ -297,7 +297,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "coralogix", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["coralogix"].CreateDefaultConfig().(*coralogixexporter.Config) cfg.Traces.Endpoint = endpoint return cfg @@ -305,7 +305,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "datadog", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["datadog"].CreateDefaultConfig().(*datadogexporter.Config) cfg.API.Key = "cutedogsgotoheaven" return cfg @@ -313,7 +313,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "dynatrace", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["dynatrace"].CreateDefaultConfig().(*dtconf.Config) cfg.Endpoint = "http://" + endpoint cfg.APIToken = "dynamictracing" @@ -322,7 +322,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "elasticsearch", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["elasticsearch"].CreateDefaultConfig().(*elasticsearchexporter.Config) cfg.Endpoints = []string{"http://" + endpoint} return cfg @@ -330,7 +330,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "f5cloud", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["f5cloud"].CreateDefaultConfig().(*f5cloudexporter.Config) cfg.Endpoint = "http://" + endpoint cfg.Source = "magic-source" @@ -352,7 +352,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "humio", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["humio"].CreateDefaultConfig().(*humioexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -360,7 +360,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "influxdb", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["influxdb"].CreateDefaultConfig().(*influxdbexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -368,7 +368,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "instana", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["instana"].CreateDefaultConfig().(*instanaexporter.Config) cfg.Endpoint = "http://" + endpoint cfg.AgentKey = "Key1" @@ -377,14 +377,14 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "loadbalancing", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["loadbalancing"].CreateDefaultConfig().(*loadbalancingexporter.Config) return cfg }, }, { exporter: "logzio", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["logzio"].CreateDefaultConfig().(*logzioexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -392,7 +392,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "loki", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["loki"].CreateDefaultConfig().(*lokiexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -400,7 +400,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "mezmo", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["mezmo"].CreateDefaultConfig().(*mezmoexporter.Config) cfg.Endpoint = "http://" + endpoint return cfg @@ -408,21 +408,21 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "sentry", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["sentry"].CreateDefaultConfig().(*sentryexporter.Config) return cfg }, }, { exporter: "skywalking", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["skywalking"].CreateDefaultConfig().(*skywalkingexporter.Config) return cfg }, }, { exporter: "sumologic", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["sumologic"].CreateDefaultConfig().(*sumologicexporter.Config) cfg.Endpoint = "http://" + endpoint @@ -431,7 +431,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "tanzuobservability", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["tanzuobservability"].CreateDefaultConfig().(*tanzuobservabilityexporter.Config) cfg.Traces.Endpoint = "http://" + endpoint return cfg @@ -439,7 +439,7 @@ func TestDefaultExporters(t *testing.T) { }, { exporter: "tencentcloud_logservice", - getConfigFn: func() component.ExporterConfig { + getConfigFn: func() component.Config { cfg := expFactories["tencentcloud_logservice"].CreateDefaultConfig().(*tencentcloudlogserviceexporter.Config) return cfg @@ -470,7 +470,7 @@ func TestDefaultExporters(t *testing.T) { // GetExporterConfigFn is used customize the configuration passed to the verification. // This is used to change ports or provide values required but not provided by the // default configuration. -type getExporterConfigFn func() component.ExporterConfig +type getExporterConfigFn func() component.Config // verifyExporterLifecycle is used to test if an exporter type can handle the typical // lifecycle of a component. The getConfigFn parameter only need to be specified if @@ -511,23 +511,23 @@ func verifyExporterLifecycle(t *testing.T, factory component.ExporterFactory, ge type createExporterFn func( ctx context.Context, set component.ExporterCreateSettings, - cfg component.ExporterConfig, + cfg component.Config, ) (component.Component, error) func wrapCreateLogsExp(factory component.ExporterFactory) createExporterFn { - return func(ctx context.Context, set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.Component, error) { + return func(ctx context.Context, set component.ExporterCreateSettings, cfg component.Config) (component.Component, error) { return factory.CreateLogsExporter(ctx, set, cfg) } } func wrapCreateTracesExp(factory component.ExporterFactory) createExporterFn { - return func(ctx context.Context, set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.Component, error) { + return func(ctx context.Context, set component.ExporterCreateSettings, cfg component.Config) (component.Component, error) { return factory.CreateTracesExporter(ctx, set, cfg) } } func wrapCreateMetricsExp(factory component.ExporterFactory) createExporterFn { - return func(ctx context.Context, set component.ExporterCreateSettings, cfg component.ExporterConfig) (component.Component, error) { + return func(ctx context.Context, set component.ExporterCreateSettings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsExporter(ctx, set, cfg) } } diff --git a/internal/components/extensions_test.go b/internal/components/extensions_test.go index 8ba3d837714a..204ec6627b44 100644 --- a/internal/components/extensions_test.go +++ b/internal/components/extensions_test.go @@ -63,7 +63,7 @@ func TestDefaultExtensions(t *testing.T) { }{ { extension: "health_check", - getConfigFn: func() component.ExtensionConfig { + getConfigFn: func() component.Config { cfg := extFactories["health_check"].CreateDefaultConfig().(*healthcheckextension.Config) cfg.Endpoint = endpoint return cfg @@ -71,7 +71,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "pprof", - getConfigFn: func() component.ExtensionConfig { + getConfigFn: func() component.Config { cfg := extFactories["pprof"].CreateDefaultConfig().(*pprofextension.Config) cfg.TCPAddr.Endpoint = endpoint return cfg @@ -79,14 +79,14 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "sigv4auth", - getConfigFn: func() component.ExtensionConfig { + getConfigFn: func() component.Config { cfg := extFactories["sigv4auth"].CreateDefaultConfig().(*sigv4authextension.Config) return cfg }, }, { extension: "zpages", - getConfigFn: func() component.ExtensionConfig { + getConfigFn: func() component.Config { cfg := extFactories["zpages"].CreateDefaultConfig().(*zpagesextension.Config) cfg.TCPAddr.Endpoint = endpoint return cfg @@ -94,7 +94,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "basicauth", - getConfigFn: func() component.ExtensionConfig { + getConfigFn: func() component.Config { cfg := extFactories["basicauth"].CreateDefaultConfig().(*basicauthextension.Config) // No need to clean up, t.TempDir will be deleted entirely. fileName := filepath.Join(t.TempDir(), "random.file") @@ -109,7 +109,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "bearertokenauth", - getConfigFn: func() component.ExtensionConfig { + getConfigFn: func() component.Config { cfg := extFactories["bearertokenauth"].CreateDefaultConfig().(*bearertokenauthextension.Config) cfg.BearerToken = "sometoken" return cfg @@ -117,14 +117,14 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "memory_ballast", - getConfigFn: func() component.ExtensionConfig { + getConfigFn: func() component.Config { cfg := extFactories["memory_ballast"].CreateDefaultConfig().(*ballastextension.Config) return cfg }, }, { extension: "asapclient", - getConfigFn: func() component.ExtensionConfig { + getConfigFn: func() component.Config { cfg := extFactories["asapclient"].CreateDefaultConfig().(*asapauthextension.Config) cfg.KeyID = "test_issuer/test_kid" cfg.Issuer = "test_issuer" @@ -142,7 +142,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "ecs_task_observer", - getConfigFn: func() component.ExtensionConfig { + getConfigFn: func() component.Config { cfg := extFactories["ecs_task_observer"].CreateDefaultConfig().(*ecstaskobserver.Config) cfg.Endpoint = "http://localhost" return cfg @@ -154,7 +154,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "fluentbit", - getConfigFn: func() component.ExtensionConfig { + getConfigFn: func() component.Config { cfg := extFactories["fluentbit"].CreateDefaultConfig().(*fluentbitextension.Config) cfg.TCPEndpoint = "http://" + endpoint return cfg @@ -162,7 +162,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "http_forwarder", - getConfigFn: func() component.ExtensionConfig { + getConfigFn: func() component.Config { cfg := extFactories["http_forwarder"].CreateDefaultConfig().(*httpforwarder.Config) cfg.Egress.Endpoint = "http://" + endpoint cfg.Ingress.Endpoint = testutil.GetAvailableLocalAddress(t) @@ -171,7 +171,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "oauth2client", - getConfigFn: func() component.ExtensionConfig { + getConfigFn: func() component.Config { cfg := extFactories["oauth2client"].CreateDefaultConfig().(*oauth2clientauthextension.Config) cfg.ClientID = "otel-extension" cfg.ClientSecret = "testsarehard" @@ -185,7 +185,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "db_storage", - getConfigFn: func() component.ExtensionConfig { + getConfigFn: func() component.Config { cfg := extFactories["db_storage"].CreateDefaultConfig().(*dbstorage.Config) cfg.DriverName = "sqlite3" cfg.DataSource = filepath.Join(t.TempDir(), "foo.db") @@ -194,7 +194,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "file_storage", - getConfigFn: func() component.ExtensionConfig { + getConfigFn: func() component.Config { cfg := extFactories["file_storage"].CreateDefaultConfig().(*filestorage.Config) cfg.Directory = t.TempDir() return cfg @@ -202,7 +202,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "host_observer", - getConfigFn: func() component.ExtensionConfig { + getConfigFn: func() component.Config { cfg := extFactories["host_observer"].CreateDefaultConfig().(*hostobserver.Config) return cfg }, @@ -213,7 +213,7 @@ func TestDefaultExtensions(t *testing.T) { }, { extension: "headers_setter", - getConfigFn: func() component.ExtensionConfig { + getConfigFn: func() component.Config { cfg := extFactories["headers_setter"].CreateDefaultConfig().(*headerssetterextension.Config) return cfg }, @@ -241,7 +241,7 @@ func TestDefaultExtensions(t *testing.T) { // getExtensionConfigFn is used customize the configuration passed to the verification. // This is used to change ports or provide values required but not provided by the // default configuration. -type getExtensionConfigFn func() component.ExtensionConfig +type getExtensionConfigFn func() component.Config // verifyExtensionLifecycle is used to test if an extension type can handle the typical // lifecycle of a component. The getConfigFn parameter only need to be specified if diff --git a/internal/components/processors_test.go b/internal/components/processors_test.go index 06a7f7033b7f..937e3885e019 100644 --- a/internal/components/processors_test.go +++ b/internal/components/processors_test.go @@ -50,7 +50,7 @@ func TestDefaultProcessors(t *testing.T) { }{ { processor: "attributes", - getConfigFn: func() component.ProcessorConfig { + getConfigFn: func() component.Config { cfg := procFactories["attributes"].CreateDefaultConfig().(*attributesprocessor.Config) cfg.Actions = []attraction.ActionKeyValue{ {Key: "attribute1", Action: attraction.INSERT, Value: 123}, @@ -79,7 +79,7 @@ func TestDefaultProcessors(t *testing.T) { }, { processor: "memory_limiter", - getConfigFn: func() component.ProcessorConfig { + getConfigFn: func() component.Config { cfg := procFactories["memory_limiter"].CreateDefaultConfig().(*memorylimiterprocessor.Config) cfg.CheckInterval = 100 * time.Millisecond cfg.MemoryLimitMiB = 1024 * 1024 @@ -100,7 +100,7 @@ func TestDefaultProcessors(t *testing.T) { }, { processor: "resource", - getConfigFn: func() component.ProcessorConfig { + getConfigFn: func() component.Config { cfg := procFactories["resource"].CreateDefaultConfig().(*resourceprocessor.Config) cfg.AttributesActions = []attraction.ActionKeyValue{ {Key: "attribute1", Action: attraction.INSERT, Value: 123}, @@ -114,7 +114,7 @@ func TestDefaultProcessors(t *testing.T) { }, { processor: "span", - getConfigFn: func() component.ProcessorConfig { + getConfigFn: func() component.Config { cfg := procFactories["span"].CreateDefaultConfig().(*spanprocessor.Config) cfg.Rename.FromAttributes = []string{"test-key"} return cfg @@ -159,7 +159,7 @@ func TestDefaultProcessors(t *testing.T) { // getProcessorConfigFn is used customize the configuration passed to the verification. // This is used to change ports or provide values required but not provided by the // default configuration. -type getProcessorConfigFn func() component.ProcessorConfig +type getProcessorConfigFn func() component.Config // verifyProcessorLifecycle is used to test if an processor type can handle the typical // lifecycle of a component. The getConfigFn parameter only need to be specified if @@ -198,23 +198,23 @@ func verifyProcessorLifecycle(t *testing.T, factory component.ProcessorFactory, type createProcessorFn func( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, ) (component.Component, error) func wrapCreateLogsProc(factory component.ProcessorFactory) createProcessorFn { - return func(ctx context.Context, set component.ProcessorCreateSettings, cfg component.ProcessorConfig) (component.Component, error) { + return func(ctx context.Context, set component.ProcessorCreateSettings, cfg component.Config) (component.Component, error) { return factory.CreateLogsProcessor(ctx, set, cfg, consumertest.NewNop()) } } func wrapCreateMetricsProc(factory component.ProcessorFactory) createProcessorFn { - return func(ctx context.Context, set component.ProcessorCreateSettings, cfg component.ProcessorConfig) (component.Component, error) { + return func(ctx context.Context, set component.ProcessorCreateSettings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsProcessor(ctx, set, cfg, consumertest.NewNop()) } } func wrapCreateTracesProc(factory component.ProcessorFactory) createProcessorFn { - return func(ctx context.Context, set component.ProcessorCreateSettings, cfg component.ProcessorConfig) (component.Component, error) { + return func(ctx context.Context, set component.ProcessorCreateSettings, cfg component.Config) (component.Component, error) { return factory.CreateTracesProcessor(ctx, set, cfg, consumertest.NewNop()) } } diff --git a/internal/components/receivers_test.go b/internal/components/receivers_test.go index 35fd0f49b0e0..7bee944b28ff 100644 --- a/internal/components/receivers_test.go +++ b/internal/components/receivers_test.go @@ -72,7 +72,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "awscloudwatch", - getConfigFn: func() component.ReceiverConfig { + getConfigFn: func() component.Config { cfg := rcvrFactories["awscloudwatch"].CreateDefaultConfig().(*awscloudwatchreceiver.Config) cfg.Region = "us-west-2" cfg.Logs.Groups = awscloudwatchreceiver.GroupConfig{AutodiscoverConfig: nil} @@ -97,7 +97,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "azureeventhub", - getConfigFn: func() component.ReceiverConfig { + getConfigFn: func() component.Config { cfg := rcvrFactories["azureeventhub"].CreateDefaultConfig().(*azureeventhubreceiver.Config) cfg.Connection = "Endpoint=sb://example.com/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=superSecret1234=;EntityPath=hubName" return cfg @@ -109,7 +109,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "carbon", - getConfigFn: func() component.ReceiverConfig { + getConfigFn: func() component.Config { cfg := rcvrFactories["carbon"].CreateDefaultConfig().(*carbonreceiver.Config) cfg.Endpoint = "0.0.0.0:0" return cfg @@ -122,7 +122,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "chrony", - getConfigFn: func() component.ReceiverConfig { + getConfigFn: func() component.Config { cfg := rcvrFactories["chrony"].CreateDefaultConfig().(*chronyreceiver.Config) cfg.Endpoint = "udp://localhost:323" return cfg @@ -150,7 +150,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "filelog", - getConfigFn: func() component.ReceiverConfig { + getConfigFn: func() component.Config { cfg := rcvrFactories["filelog"].CreateDefaultConfig().(*filelogreceiver.FileLogConfig) cfg.InputConfig.Include = []string{filepath.Join(t.TempDir(), "*")} return cfg @@ -225,7 +225,7 @@ func TestDefaultReceivers(t *testing.T) { { receiver: "mongodbatlas", // MongoDB Atlas needs unique config IDs - getConfigFn: func() component.ReceiverConfig { + getConfigFn: func() component.Config { cfg := rcvrFactories["mongodbatlas"].CreateDefaultConfig().(*mongodbatlasreceiver.Config) cfg.SetIDName(strconv.Itoa(int(time.Now().UnixNano()))) cfg.Logs.Enabled = true @@ -253,7 +253,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "otlpjsonfile", - getConfigFn: func() component.ReceiverConfig { + getConfigFn: func() component.Config { cfg := rcvrFactories["otlpjsonfile"].CreateDefaultConfig().(*otlpjsonfilereceiver.Config) cfg.Include = []string{"/tmp/*.log"} return cfg @@ -268,7 +268,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "prometheus", - getConfigFn: func() component.ReceiverConfig { + getConfigFn: func() component.Config { cfg := rcvrFactories["prometheus"].CreateDefaultConfig().(*prometheusreceiver.Config) cfg.PrometheusConfig = &promconfig.Config{ ScrapeConfigs: []*promconfig.ScrapeConfig{ @@ -315,7 +315,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "snmp", - getConfigFn: func() component.ReceiverConfig { + getConfigFn: func() component.Config { cfg := rcvrFactories["snmp"].CreateDefaultConfig().(*snmpreceiver.Config) cfg.Metrics = map[string]*snmpreceiver.MetricConfig{ "m1": { @@ -362,7 +362,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "syslog", - getConfigFn: func() component.ReceiverConfig { + getConfigFn: func() component.Config { cfg := rcvrFactories["syslog"].CreateDefaultConfig().(*syslogreceiver.SysLogConfig) cfg.InputConfig.TCP = &tcpop.NewConfig().BaseConfig cfg.InputConfig.TCP.ListenAddress = "0.0.0.0:0" @@ -372,7 +372,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "tcplog", - getConfigFn: func() component.ReceiverConfig { + getConfigFn: func() component.Config { cfg := rcvrFactories["tcplog"].CreateDefaultConfig().(*tcplogreceiver.TCPLogConfig) cfg.InputConfig.ListenAddress = "0.0.0.0:0" return cfg @@ -380,7 +380,7 @@ func TestDefaultReceivers(t *testing.T) { }, { receiver: "udplog", - getConfigFn: func() component.ReceiverConfig { + getConfigFn: func() component.Config { cfg := rcvrFactories["udplog"].CreateDefaultConfig().(*udplogreceiver.UDPLogConfig) cfg.InputConfig.ListenAddress = "0.0.0.0:0" return cfg @@ -416,7 +416,7 @@ func TestDefaultReceivers(t *testing.T) { // getReceiverConfigFn is used customize the configuration passed to the verification. // This is used to change ports or provide values required but not provided by the // default configuration. -type getReceiverConfigFn func() component.ReceiverConfig +type getReceiverConfigFn func() component.Config // verifyReceiverLifecycle is used to test if a receiver type can handle the typical // lifecycle of a component. The getConfigFn parameter only need to be specified if @@ -456,23 +456,23 @@ func verifyReceiverLifecycle(t *testing.T, factory component.ReceiverFactory, ge type createReceiverFn func( ctx context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, ) (component.Component, error) func wrapCreateLogsRcvr(factory component.ReceiverFactory) createReceiverFn { - return func(ctx context.Context, set component.ReceiverCreateSettings, cfg component.ReceiverConfig) (component.Component, error) { + return func(ctx context.Context, set component.ReceiverCreateSettings, cfg component.Config) (component.Component, error) { return factory.CreateLogsReceiver(ctx, set, cfg, consumertest.NewNop()) } } func wrapCreateMetricsRcvr(factory component.ReceiverFactory) createReceiverFn { - return func(ctx context.Context, set component.ReceiverCreateSettings, cfg component.ReceiverConfig) (component.Component, error) { + return func(ctx context.Context, set component.ReceiverCreateSettings, cfg component.Config) (component.Component, error) { return factory.CreateMetricsReceiver(ctx, set, cfg, consumertest.NewNop()) } } func wrapCreateTracesRcvr(factory component.ReceiverFactory) createReceiverFn { - return func(ctx context.Context, set component.ReceiverCreateSettings, cfg component.ReceiverConfig) (component.Component, error) { + return func(ctx context.Context, set component.ReceiverCreateSettings, cfg component.Config) (component.Component, error) { return factory.CreateTracesReceiver(ctx, set, cfg, consumertest.NewNop()) } } diff --git a/internal/coreinternal/go.mod b/internal/coreinternal/go.mod index 570145436af3..fba09763ae87 100644 --- a/internal/coreinternal/go.mod +++ b/internal/coreinternal/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) diff --git a/internal/coreinternal/go.sum b/internal/coreinternal/go.sum index 8a079b7167e1..240e23eb3699 100644 --- a/internal/coreinternal/go.sum +++ b/internal/coreinternal/go.sum @@ -45,13 +45,13 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= go.opentelemetry.io/collector/consumer v0.65.0 h1:9pjl1zV8nQ2QtQLuCcu0X7i9k+qXlTsE3YS9IaIQqHY= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/filter/go.mod b/internal/filter/go.mod index 2220d6c1c0d9..81406dfc9de2 100644 --- a/internal/filter/go.mod +++ b/internal/filter/go.mod @@ -8,9 +8,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -28,9 +28,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect - go.opentelemetry.io/collector/component v0.66.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/internal/filter/go.sum b/internal/filter/go.sum index 25bf9bb0afe7..ce0a9db17d30 100644 --- a/internal/filter/go.sum +++ b/internal/filter/go.sum @@ -277,18 +277,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/internal/k8sconfig/config.go b/internal/k8sconfig/config.go index 6e2d49d392c1..bd7ae1a57456 100644 --- a/internal/k8sconfig/config.go +++ b/internal/k8sconfig/config.go @@ -55,6 +55,7 @@ var authTypes = map[AuthType]bool{ AuthTypeNone: true, AuthTypeServiceAccount: true, AuthTypeKubeConfig: true, + AuthTypeTLS: true, } // APIConfig contains options relevant to connecting to the K8s API diff --git a/internal/kubelet/go.mod b/internal/kubelet/go.mod index eb5cdb7c2086..4d3b2b93a134 100644 --- a/internal/kubelet/go.mod +++ b/internal/kubelet/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) diff --git a/internal/kubelet/go.sum b/internal/kubelet/go.sum index 70523ba1f3ad..86caee8ce0d8 100644 --- a/internal/kubelet/go.sum +++ b/internal/kubelet/go.sum @@ -252,8 +252,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/scrapertest/go.mod b/internal/scrapertest/go.mod index d990f61d2d4b..e60d54a13cb8 100644 --- a/internal/scrapertest/go.mod +++ b/internal/scrapertest/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 ) diff --git a/internal/scrapertest/go.sum b/internal/scrapertest/go.sum index 16a43ab44bb1..02f8a2c49068 100644 --- a/internal/scrapertest/go.sum +++ b/internal/scrapertest/go.sum @@ -61,8 +61,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/internal/sharedcomponent/go.mod b/internal/sharedcomponent/go.mod index c997367a38a0..50d80905aa27 100644 --- a/internal/sharedcomponent/go.mod +++ b/internal/sharedcomponent/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/component v0.66.0 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -22,10 +22,10 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector v0.66.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/internal/sharedcomponent/go.sum b/internal/sharedcomponent/go.sum index 272bdd501503..10b29d8d14e7 100644 --- a/internal/sharedcomponent/go.sum +++ b/internal/sharedcomponent/go.sum @@ -265,16 +265,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index 045d852b45dc..cd3382cd17bf 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -4,10 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 ) @@ -28,8 +28,8 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/component v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index dd8e65adc1ba..48a42a8e7500 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -286,18 +286,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/pkg/batchperresourceattr/go.mod b/pkg/batchperresourceattr/go.mod index 3a854226fc9a..94b7d94ffec2 100644 --- a/pkg/batchperresourceattr/go.mod +++ b/pkg/batchperresourceattr/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 ) diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index b88f97b89856..98c24dd8e9a9 100644 --- a/pkg/batchperresourceattr/go.sum +++ b/pkg/batchperresourceattr/go.sum @@ -85,10 +85,10 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.65.0 h1:LId2egS/jd/EsGHe6fm36UXouQtyc6n7U2MPDEGw/Kk= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= diff --git a/pkg/batchpersignal/go.mod b/pkg/batchpersignal/go.mod index 65aa07423b9a..9979aa69f0ea 100644 --- a/pkg/batchpersignal/go.mod +++ b/pkg/batchpersignal/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( diff --git a/pkg/batchpersignal/go.sum b/pkg/batchpersignal/go.sum index b2862f240a39..cbcf7b53153f 100644 --- a/pkg/batchpersignal/go.sum +++ b/pkg/batchpersignal/go.sum @@ -51,8 +51,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= diff --git a/pkg/ottl/go.mod b/pkg/ottl/go.mod index 0baab8c57e88..ca466af0d035 100644 --- a/pkg/ottl/go.mod +++ b/pkg/ottl/go.mod @@ -7,8 +7,8 @@ require ( github.com/gobwas/glob v0.2.3 github.com/iancoleman/strcase v0.2.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.opentelemetry.io/otel/trace v1.11.1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -30,9 +30,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector v0.66.0 // indirect - go.opentelemetry.io/collector/consumer v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.uber.org/atomic v1.10.0 // indirect diff --git a/pkg/ottl/go.sum b/pkg/ottl/go.sum index 2b1577291626..4d89c2b27acf 100644 --- a/pkg/ottl/go.sum +++ b/pkg/ottl/go.sum @@ -268,16 +268,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/pkg/resourcetotelemetry/go.mod b/pkg/resourcetotelemetry/go.mod index ca1f71e18d80..76ba52900c3d 100644 --- a/pkg/resourcetotelemetry/go.mod +++ b/pkg/resourcetotelemetry/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -24,8 +24,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect - go.opentelemetry.io/collector v0.66.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/pkg/resourcetotelemetry/go.sum b/pkg/resourcetotelemetry/go.sum index febb68028463..5affc98d0f51 100644 --- a/pkg/resourcetotelemetry/go.sum +++ b/pkg/resourcetotelemetry/go.sum @@ -255,16 +255,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/pkg/stanza/adapter/factory.go b/pkg/stanza/adapter/factory.go index 2043a562caf4..9d9e5d66c853 100644 --- a/pkg/stanza/adapter/factory.go +++ b/pkg/stanza/adapter/factory.go @@ -28,9 +28,9 @@ import ( // LogReceiverType is the interface used by stanza-based log receivers type LogReceiverType interface { Type() component.Type - CreateDefaultConfig() component.ReceiverConfig - BaseConfig(component.ReceiverConfig) BaseConfig - InputConfig(component.ReceiverConfig) operator.Config + CreateDefaultConfig() component.Config + BaseConfig(component.Config) BaseConfig + InputConfig(component.Config) operator.Config } // NewFactory creates a factory for a Stanza-based receiver @@ -46,7 +46,7 @@ func createLogsReceiver(logReceiverType LogReceiverType) component.CreateLogsRec return func( ctx context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Logs, ) (component.LogsReceiver, error) { inputCfg := logReceiverType.InputConfig(cfg) diff --git a/pkg/stanza/adapter/mocks_test.go b/pkg/stanza/adapter/mocks_test.go index f4ce80683e6b..b13b45235be4 100644 --- a/pkg/stanza/adapter/mocks_test.go +++ b/pkg/stanza/adapter/mocks_test.go @@ -91,7 +91,7 @@ func (f TestReceiverType) Type() component.Type { return testType } -func (f TestReceiverType) CreateDefaultConfig() component.ReceiverConfig { +func (f TestReceiverType) CreateDefaultConfig() component.Config { return &TestConfig{ BaseConfig: BaseConfig{ ReceiverSettings: config.NewReceiverSettings(component.NewID(testType)), @@ -101,10 +101,10 @@ func (f TestReceiverType) CreateDefaultConfig() component.ReceiverConfig { } } -func (f TestReceiverType) BaseConfig(cfg component.ReceiverConfig) BaseConfig { +func (f TestReceiverType) BaseConfig(cfg component.Config) BaseConfig { return cfg.(*TestConfig).BaseConfig } -func (f TestReceiverType) InputConfig(cfg component.ReceiverConfig) operator.Config { +func (f TestReceiverType) InputConfig(cfg component.Config) operator.Config { return cfg.(*TestConfig).Input } diff --git a/pkg/stanza/go.mod b/pkg/stanza/go.mod index b706c3c4781b..0b5039bb8d2f 100644 --- a/pkg/stanza/go.mod +++ b/pkg/stanza/go.mod @@ -12,10 +12,10 @@ require ( github.com/observiq/nanojack v0.0.0-20201106172433-343928847ebc github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -41,7 +41,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/pkg/stanza/go.sum b/pkg/stanza/go.sum index 4e5de94b59d2..aafba5948a4e 100644 --- a/pkg/stanza/go.sum +++ b/pkg/stanza/go.sum @@ -311,16 +311,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/pkg/stanza/operator/operatortest/confmap.go b/pkg/stanza/operator/operatortest/confmap.go index 188108b9a06e..4ca58205e541 100644 --- a/pkg/stanza/operator/operatortest/confmap.go +++ b/pkg/stanza/operator/operatortest/confmap.go @@ -53,7 +53,7 @@ func (c ConfigUnmarshalTests) Run(t *testing.T) { require.NotZero(t, len(testConfMap.AllKeys()), fmt.Sprintf("config not found: '%s'", tc.Name)) cfg := newAnyOpConfig(c.DefaultConfig) - err = component.UnmarshalReceiverConfig(testConfMap, cfg) + err = component.UnmarshalConfig(testConfMap, cfg) if tc.ExpectErr { require.Error(t, err) diff --git a/pkg/translator/jaeger/go.mod b/pkg/translator/jaeger/go.mod index 8fc76a7346a7..3d5202610984 100644 --- a/pkg/translator/jaeger/go.mod +++ b/pkg/translator/jaeger/go.mod @@ -6,8 +6,8 @@ require ( github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( diff --git a/pkg/translator/jaeger/go.sum b/pkg/translator/jaeger/go.sum index 3d36908d0d47..fbe3132e6f1d 100644 --- a/pkg/translator/jaeger/go.sum +++ b/pkg/translator/jaeger/go.sum @@ -48,10 +48,10 @@ github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVK github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/pkg/translator/loki/go.mod b/pkg/translator/loki/go.mod index 84dfa792d752..37094a9ecbc2 100644 --- a/pkg/translator/loki/go.mod +++ b/pkg/translator/loki/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/prometheus/common v0.37.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( diff --git a/pkg/translator/loki/go.sum b/pkg/translator/loki/go.sum index 75f370dd54f2..0eac55d4015d 100644 --- a/pkg/translator/loki/go.sum +++ b/pkg/translator/loki/go.sum @@ -438,8 +438,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/pkg/translator/opencensus/go.mod b/pkg/translator/opencensus/go.mod index ffa5a38a003c..4f7f0271dd5f 100644 --- a/pkg/translator/opencensus/go.mod +++ b/pkg/translator/opencensus/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 google.golang.org/protobuf v1.28.1 ) diff --git a/pkg/translator/opencensus/go.sum b/pkg/translator/opencensus/go.sum index 460d64646633..c4830116a10b 100644 --- a/pkg/translator/opencensus/go.sum +++ b/pkg/translator/opencensus/go.sum @@ -76,10 +76,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/pkg/translator/prometheus/go.mod b/pkg/translator/prometheus/go.mod index e84e4afc06ae..3ca56e29b05a 100644 --- a/pkg/translator/prometheus/go.mod +++ b/pkg/translator/prometheus/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/featuregate v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( diff --git a/pkg/translator/prometheus/go.sum b/pkg/translator/prometheus/go.sum index 4fd583391d66..a0b60e05c875 100644 --- a/pkg/translator/prometheus/go.sum +++ b/pkg/translator/prometheus/go.sum @@ -81,10 +81,10 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= diff --git a/pkg/translator/prometheusremotewrite/go.mod b/pkg/translator/prometheusremotewrite/go.mod index 37fe157d66b9..ce7795266154 100644 --- a/pkg/translator/prometheusremotewrite/go.mod +++ b/pkg/translator/prometheusremotewrite/go.mod @@ -8,9 +8,9 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 ) @@ -24,7 +24,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced // indirect golang.org/x/sys v0.2.0 // indirect diff --git a/pkg/translator/prometheusremotewrite/go.sum b/pkg/translator/prometheusremotewrite/go.sum index 0cd30a36e0c3..88e4a1204bd7 100644 --- a/pkg/translator/prometheusremotewrite/go.sum +++ b/pkg/translator/prometheusremotewrite/go.sum @@ -213,15 +213,15 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/pkg/translator/signalfx/go.mod b/pkg/translator/signalfx/go.mod index 8e0b0a66e807..c0bb555ce0e6 100644 --- a/pkg/translator/signalfx/go.mod +++ b/pkg/translator/signalfx/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 ) diff --git a/pkg/translator/signalfx/go.sum b/pkg/translator/signalfx/go.sum index fc396861409a..ca141ae245b8 100644 --- a/pkg/translator/signalfx/go.sum +++ b/pkg/translator/signalfx/go.sum @@ -59,8 +59,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/pkg/translator/zipkin/go.mod b/pkg/translator/zipkin/go.mod index 173e17ee292e..d6816a7ca17f 100644 --- a/pkg/translator/zipkin/go.mod +++ b/pkg/translator/zipkin/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( diff --git a/pkg/translator/zipkin/go.sum b/pkg/translator/zipkin/go.sum index 202d925ff411..b2da86beced5 100644 --- a/pkg/translator/zipkin/go.sum +++ b/pkg/translator/zipkin/go.sum @@ -50,10 +50,10 @@ github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVK github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= diff --git a/processor/attributesprocessor/config.go b/processor/attributesprocessor/config.go index 4559532aa510..d66915e8d724 100644 --- a/processor/attributesprocessor/config.go +++ b/processor/attributesprocessor/config.go @@ -40,7 +40,7 @@ type Config struct { attraction.Settings `mapstructure:",squash"` } -var _ component.ProcessorConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the processor configuration is valid func (cfg *Config) Validate() error { diff --git a/processor/attributesprocessor/config_test.go b/processor/attributesprocessor/config_test.go index c700a090d71f..672b7b876845 100644 --- a/processor/attributesprocessor/config_test.go +++ b/processor/attributesprocessor/config_test.go @@ -34,7 +34,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ProcessorConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, "insert"), @@ -232,7 +232,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/processor/attributesprocessor/factory.go b/processor/attributesprocessor/factory.go index 08d711e02d78..c7c5c4d1a56a 100644 --- a/processor/attributesprocessor/factory.go +++ b/processor/attributesprocessor/factory.go @@ -49,7 +49,7 @@ func NewFactory() component.ProcessorFactory { } // Note: This isn't a valid configuration because the processor would do no work. -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } @@ -58,7 +58,7 @@ func createDefaultConfig() component.ProcessorConfig { func createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { oCfg := cfg.(*Config) @@ -85,7 +85,7 @@ func createTracesProcessor( func createLogsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Logs, ) (component.LogsProcessor, error) { oCfg := cfg.(*Config) @@ -114,7 +114,7 @@ func createLogsProcessor( func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { diff --git a/processor/attributesprocessor/go.mod b/processor/attributesprocessor/go.mod index bdc556b0c1d0..9b2b479b1ec5 100644 --- a/processor/attributesprocessor/go.mod +++ b/processor/attributesprocessor/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -31,7 +31,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/attributesprocessor/go.sum b/processor/attributesprocessor/go.sum index 89db85155b3d..91d1d71d4f4e 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/go.sum @@ -278,18 +278,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/cumulativetodeltaprocessor/config.go b/processor/cumulativetodeltaprocessor/config.go index a7dc6bd5d402..4be99235f370 100644 --- a/processor/cumulativetodeltaprocessor/config.go +++ b/processor/cumulativetodeltaprocessor/config.go @@ -45,7 +45,7 @@ type MatchMetrics struct { Metrics []string `mapstructure:"metrics"` } -var _ component.ProcessorConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks whether the input configuration has all of the required fields for the processor. // An error is returned if there are any invalid inputs. diff --git a/processor/cumulativetodeltaprocessor/config_test.go b/processor/cumulativetodeltaprocessor/config_test.go index ade6f82c1503..c85e6565afb8 100644 --- a/processor/cumulativetodeltaprocessor/config_test.go +++ b/processor/cumulativetodeltaprocessor/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ProcessorConfig + expected component.Config errorMessage string }{ { @@ -112,7 +112,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) diff --git a/processor/cumulativetodeltaprocessor/factory.go b/processor/cumulativetodeltaprocessor/factory.go index addf91a5239c..d33d85fa32b0 100644 --- a/processor/cumulativetodeltaprocessor/factory.go +++ b/processor/cumulativetodeltaprocessor/factory.go @@ -41,7 +41,7 @@ func NewFactory() component.ProcessorFactory { component.WithMetricsProcessor(createMetricsProcessor, stability)) } -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } @@ -50,7 +50,7 @@ func createDefaultConfig() component.ProcessorConfig { func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { processorConfig, ok := cfg.(*Config) diff --git a/processor/cumulativetodeltaprocessor/factory_test.go b/processor/cumulativetodeltaprocessor/factory_test.go index 6bc723c3f9c7..889f8bff75db 100644 --- a/processor/cumulativetodeltaprocessor/factory_test.go +++ b/processor/cumulativetodeltaprocessor/factory_test.go @@ -57,7 +57,7 @@ func TestCreateProcessors(t *testing.T) { sub, err := cm.Sub(k) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) tp, tErr := factory.CreateTracesProcessor( context.Background(), diff --git a/processor/cumulativetodeltaprocessor/go.mod b/processor/cumulativetodeltaprocessor/go.mod index 5a4c2bbc718c..07bcdf5cb223 100644 --- a/processor/cumulativetodeltaprocessor/go.mod +++ b/processor/cumulativetodeltaprocessor/go.mod @@ -5,11 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/featuregate v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 ) diff --git a/processor/cumulativetodeltaprocessor/go.sum b/processor/cumulativetodeltaprocessor/go.sum index c8e8197451c8..6199bef6fe13 100644 --- a/processor/cumulativetodeltaprocessor/go.sum +++ b/processor/cumulativetodeltaprocessor/go.sum @@ -257,16 +257,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/deltatorateprocessor/config_test.go b/processor/deltatorateprocessor/config_test.go index 3478947151ef..eb8b7ebbf546 100644 --- a/processor/deltatorateprocessor/config_test.go +++ b/processor/deltatorateprocessor/config_test.go @@ -30,7 +30,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ProcessorConfig + expected component.Config errorMessage string }{ { @@ -59,7 +59,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) diff --git a/processor/deltatorateprocessor/factory.go b/processor/deltatorateprocessor/factory.go index 0baef1433db3..edc2e2e40940 100644 --- a/processor/deltatorateprocessor/factory.go +++ b/processor/deltatorateprocessor/factory.go @@ -41,7 +41,7 @@ func NewFactory() component.ProcessorFactory { component.WithMetricsProcessor(createMetricsProcessor, stability)) } -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } @@ -50,7 +50,7 @@ func createDefaultConfig() component.ProcessorConfig { func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { processorConfig, ok := cfg.(*Config) diff --git a/processor/deltatorateprocessor/factory_test.go b/processor/deltatorateprocessor/factory_test.go index 55d0e60f2742..36713b0bf00c 100644 --- a/processor/deltatorateprocessor/factory_test.go +++ b/processor/deltatorateprocessor/factory_test.go @@ -57,7 +57,7 @@ func TestCreateProcessors(t *testing.T) { sub, err := cm.Sub(k) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) tp, tErr := factory.CreateTracesProcessor( context.Background(), diff --git a/processor/deltatorateprocessor/go.mod b/processor/deltatorateprocessor/go.mod index b2f23d5c5f43..161e16e152d7 100644 --- a/processor/deltatorateprocessor/go.mod +++ b/processor/deltatorateprocessor/go.mod @@ -4,10 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -27,7 +27,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/deltatorateprocessor/go.sum b/processor/deltatorateprocessor/go.sum index e90307f6fffd..c80d33698554 100644 --- a/processor/deltatorateprocessor/go.sum +++ b/processor/deltatorateprocessor/go.sum @@ -270,16 +270,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/filterprocessor/config.go b/processor/filterprocessor/config.go index ba976050a890..26a6ae9a8be1 100644 --- a/processor/filterprocessor/config.go +++ b/processor/filterprocessor/config.go @@ -268,7 +268,7 @@ func (lmp LogSeverityNumberMatchProperties) validate() error { return lmp.Min.validate() } -var _ component.ProcessorConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the processor configuration is valid func (cfg *Config) Validate() error { diff --git a/processor/filterprocessor/config_test.go b/processor/filterprocessor/config_test.go index 50f114af01f3..9b53e4a0978a 100644 --- a/processor/filterprocessor/config_test.go +++ b/processor/filterprocessor/config_test.go @@ -98,7 +98,7 @@ func TestLoadingConfigStrict(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) @@ -181,7 +181,7 @@ func TestLoadingConfigStrictLogs(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) @@ -244,7 +244,7 @@ func TestLoadingConfigSeverityLogsStrict(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) @@ -306,7 +306,7 @@ func TestLoadingConfigSeverityLogsRegexp(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) @@ -369,7 +369,7 @@ func TestLoadingConfigBodyLogsStrict(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) @@ -432,7 +432,7 @@ func TestLoadingConfigBodyLogsRegexp(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) @@ -497,7 +497,7 @@ func TestLoadingConfigMinSeverityNumberLogs(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) @@ -529,7 +529,7 @@ func TestLoadingConfigRegexp(t *testing.T) { tests := []struct { id component.ID - expected component.ProcessorConfig + expected component.Config }{ { id: component.NewIDWithName("filter", "include"), @@ -586,7 +586,7 @@ func TestLoadingConfigRegexp(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) @@ -600,7 +600,7 @@ func TestLoadingSpans(t *testing.T) { tests := []struct { id component.ID - expected component.ProcessorConfig + expected component.Config }{ { id: component.NewIDWithName("filter", "spans"), @@ -636,7 +636,7 @@ func TestLoadingSpans(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) @@ -650,7 +650,7 @@ func TestLoadingConfigExpr(t *testing.T) { tests := []struct { id component.ID - expected component.ProcessorConfig + expected component.Config }{ { id: component.NewIDWithName("filter", "empty"), @@ -721,7 +721,7 @@ func TestLoadingConfigExpr(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) @@ -932,7 +932,7 @@ func TestLoadingConfigOTTL(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) diff --git a/processor/filterprocessor/expr_test.go b/processor/filterprocessor/expr_test.go index 12bbc180ac1e..0ecb2c33a03a 100644 --- a/processor/filterprocessor/expr_test.go +++ b/processor/filterprocessor/expr_test.go @@ -148,7 +148,7 @@ func testProcessor(t *testing.T, include []string, exclude []string) (component. return proc, next } -func exprConfig(factory component.ProcessorFactory, include []string, exclude []string) component.ProcessorConfig { +func exprConfig(factory component.ProcessorFactory, include []string, exclude []string) component.Config { cfg := factory.CreateDefaultConfig() pCfg := cfg.(*Config) pCfg.Metrics = MetricFilters{} diff --git a/processor/filterprocessor/factory.go b/processor/filterprocessor/factory.go index fa89a05e12a8..c54b752ac0ed 100644 --- a/processor/filterprocessor/factory.go +++ b/processor/filterprocessor/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ProcessorFactory { ) } -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } @@ -52,7 +52,7 @@ func createDefaultConfig() component.ProcessorConfig { func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { fp, err := newFilterMetricProcessor(set.TelemetrySettings, cfg.(*Config)) @@ -71,7 +71,7 @@ func createMetricsProcessor( func createLogsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Logs, ) (component.LogsProcessor, error) { fp, err := newFilterLogsProcessor(set.TelemetrySettings, cfg.(*Config)) @@ -90,7 +90,7 @@ func createLogsProcessor( func createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { fp, err := newFilterSpansProcessor(set.TelemetrySettings, cfg.(*Config)) diff --git a/processor/filterprocessor/factory_test.go b/processor/filterprocessor/factory_test.go index ea175f1e1370..fb46e2262be2 100644 --- a/processor/filterprocessor/factory_test.go +++ b/processor/filterprocessor/factory_test.go @@ -94,7 +94,7 @@ func TestCreateProcessors(t *testing.T) { sub, err := cm.Sub(k) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) tp, tErr := factory.CreateTracesProcessor( context.Background(), diff --git a/processor/filterprocessor/go.mod b/processor/filterprocessor/go.mod index a0c4e614b058..61e28bc1f5e1 100644 --- a/processor/filterprocessor/go.mod +++ b/processor/filterprocessor/go.mod @@ -7,10 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -33,8 +33,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/filterprocessor/go.sum b/processor/filterprocessor/go.sum index 33df1a91021d..6608f5d4257f 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/go.sum @@ -282,18 +282,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/groupbyattrsprocessor/config_test.go b/processor/groupbyattrsprocessor/config_test.go index 1ec8c1b9991e..f3e506e0b5cc 100644 --- a/processor/groupbyattrsprocessor/config_test.go +++ b/processor/groupbyattrsprocessor/config_test.go @@ -30,7 +30,7 @@ func TestLoadingConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ProcessorConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, "grouping"), @@ -58,7 +58,7 @@ func TestLoadingConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/processor/groupbyattrsprocessor/factory.go b/processor/groupbyattrsprocessor/factory.go index 57d0e5764405..d8668826f31a 100644 --- a/processor/groupbyattrsprocessor/factory.go +++ b/processor/groupbyattrsprocessor/factory.go @@ -55,7 +55,7 @@ func NewFactory() component.ProcessorFactory { } // createDefaultConfig creates the default configuration for the processor. -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), GroupByKeys: []string{}, @@ -85,7 +85,7 @@ func createGroupByAttrsProcessor(logger *zap.Logger, attributes []string) *group func createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Traces) (component.TracesProcessor, error) { oCfg := cfg.(*Config) @@ -104,7 +104,7 @@ func createTracesProcessor( func createLogsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Logs) (component.LogsProcessor, error) { oCfg := cfg.(*Config) @@ -123,7 +123,7 @@ func createLogsProcessor( func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Metrics) (component.MetricsProcessor, error) { oCfg := cfg.(*Config) diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index b65c029813ef..d63a0afbde1b 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -5,10 +5,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -27,7 +27,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index 7f10dc1be3bd..adafaba3226a 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -284,16 +284,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/processor/groupbytraceprocessor/factory.go b/processor/groupbytraceprocessor/factory.go index d8eb3ea388fa..7de10e4f6f83 100644 --- a/processor/groupbytraceprocessor/factory.go +++ b/processor/groupbytraceprocessor/factory.go @@ -55,7 +55,7 @@ func NewFactory() component.ProcessorFactory { } // createDefaultConfig creates the default configuration for the processor. -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), NumTraces: defaultNumTraces, @@ -72,7 +72,7 @@ func createDefaultConfig() component.ProcessorConfig { func createTracesProcessor( _ context.Context, params component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Traces) (component.TracesProcessor, error) { oCfg := cfg.(*Config) diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index 143f7d6723d3..b57f64a1a729 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -30,7 +30,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index 7f10dc1be3bd..adafaba3226a 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -284,16 +284,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/processor/k8sattributesprocessor/config_test.go b/processor/k8sattributesprocessor/config_test.go index 89fafc94223b..b5cf0c17a4d4 100644 --- a/processor/k8sattributesprocessor/config_test.go +++ b/processor/k8sattributesprocessor/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ProcessorConfig + expected component.Config }{ { id: component.NewID(typeStr), @@ -154,7 +154,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/processor/k8sattributesprocessor/factory.go b/processor/k8sattributesprocessor/factory.go index de4a5bc60e5c..f3d3bc7761bb 100644 --- a/processor/k8sattributesprocessor/factory.go +++ b/processor/k8sattributesprocessor/factory.go @@ -51,7 +51,7 @@ func NewFactory() component.ProcessorFactory { ) } -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeServiceAccount}, @@ -62,7 +62,7 @@ func createDefaultConfig() component.ProcessorConfig { func createTracesProcessor( ctx context.Context, params component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, next consumer.Traces, ) (component.TracesProcessor, error) { return createTracesProcessorWithOptions(ctx, params, cfg, next) @@ -71,7 +71,7 @@ func createTracesProcessor( func createLogsProcessor( ctx context.Context, params component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextLogsConsumer consumer.Logs, ) (component.LogsProcessor, error) { return createLogsProcessorWithOptions(ctx, params, cfg, nextLogsConsumer) @@ -80,7 +80,7 @@ func createLogsProcessor( func createMetricsProcessor( ctx context.Context, params component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextMetricsConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { return createMetricsProcessorWithOptions(ctx, params, cfg, nextMetricsConsumer) @@ -89,7 +89,7 @@ func createMetricsProcessor( func createTracesProcessorWithOptions( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, next consumer.Traces, options ...option, ) (component.TracesProcessor, error) { @@ -112,7 +112,7 @@ func createTracesProcessorWithOptions( func createMetricsProcessorWithOptions( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextMetricsConsumer consumer.Metrics, options ...option, ) (component.MetricsProcessor, error) { @@ -135,7 +135,7 @@ func createMetricsProcessorWithOptions( func createLogsProcessorWithOptions( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextLogsConsumer consumer.Logs, options ...option, ) (component.LogsProcessor, error) { @@ -157,7 +157,7 @@ func createLogsProcessorWithOptions( func createKubernetesProcessor( params component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, options ...option, ) (*kubernetesprocessor, error) { kp := &kubernetesprocessor{logger: params.Logger} @@ -189,7 +189,7 @@ func createKubernetesProcessor( return kp, nil } -func createProcessorOpts(cfg component.ProcessorConfig) []option { +func createProcessorOpts(cfg component.Config) []option { oCfg := cfg.(*Config) var opts []option if oCfg.Passthrough { @@ -215,7 +215,7 @@ func createProcessorOpts(cfg component.ProcessorConfig) []option { return opts } -func warnDeprecatedMetadataConfig(logger *zap.Logger, cfg component.ProcessorConfig) { +func warnDeprecatedMetadataConfig(logger *zap.Logger, cfg component.Config) { oCfg := cfg.(*Config) for _, field := range oCfg.Extract.Metadata { var oldName, newName string @@ -250,7 +250,7 @@ func warnDeprecatedMetadataConfig(logger *zap.Logger, cfg component.ProcessorCon } -func errWrongKeyConfig(cfg component.ProcessorConfig) error { +func errWrongKeyConfig(cfg component.Config) error { oCfg := cfg.(*Config) for _, r := range append(oCfg.Extract.Labels, oCfg.Extract.Annotations...) { @@ -262,7 +262,7 @@ func errWrongKeyConfig(cfg component.ProcessorConfig) error { return nil } -func warnDeprecatedPodAssociationConfig(logger *zap.Logger, cfg component.ProcessorConfig) { +func warnDeprecatedPodAssociationConfig(logger *zap.Logger, cfg component.Config) { oCfg := cfg.(*Config) deprecated := "" actual := "" diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index 99a93e94a939..ee6536da1069 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 @@ -52,7 +52,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index e3a9f895de07..cefdb884555c 100644 --- a/processor/k8sattributesprocessor/go.sum +++ b/processor/k8sattributesprocessor/go.sum @@ -438,18 +438,18 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/k8sattributesprocessor/processor_test.go b/processor/k8sattributesprocessor/processor_test.go index b6ca49e076c2..f3cede73d7a3 100644 --- a/processor/k8sattributesprocessor/processor_test.go +++ b/processor/k8sattributesprocessor/processor_test.go @@ -51,7 +51,7 @@ func newPodIdentifier(from string, name string, value string) kube.PodIdentifier } } -func newTracesProcessor(cfg component.ProcessorConfig, next consumer.Traces, options ...option) (component.TracesProcessor, error) { +func newTracesProcessor(cfg component.Config, next consumer.Traces, options ...option) (component.TracesProcessor, error) { opts := options opts = append(opts, withKubeClientProvider(newFakeClient)) return createTracesProcessorWithOptions( @@ -63,7 +63,7 @@ func newTracesProcessor(cfg component.ProcessorConfig, next consumer.Traces, opt ) } -func newMetricsProcessor(cfg component.ProcessorConfig, nextMetricsConsumer consumer.Metrics, options ...option) (component.MetricsProcessor, error) { +func newMetricsProcessor(cfg component.Config, nextMetricsConsumer consumer.Metrics, options ...option) (component.MetricsProcessor, error) { opts := options opts = append(opts, withKubeClientProvider(newFakeClient)) return createMetricsProcessorWithOptions( @@ -75,7 +75,7 @@ func newMetricsProcessor(cfg component.ProcessorConfig, nextMetricsConsumer cons ) } -func newLogsProcessor(cfg component.ProcessorConfig, nextLogsConsumer consumer.Logs, options ...option) (component.LogsProcessor, error) { +func newLogsProcessor(cfg component.Config, nextLogsConsumer consumer.Logs, options ...option) (component.LogsProcessor, error) { opts := options opts = append(opts, withKubeClientProvider(newFakeClient)) return createLogsProcessorWithOptions( @@ -120,7 +120,7 @@ type multiTest struct { func newMultiTest( t *testing.T, - cfg component.ProcessorConfig, + cfg component.Config, errFunc func(err error), options ...option, ) *multiTest { diff --git a/processor/logstransformprocessor/config.go b/processor/logstransformprocessor/config.go index 182ffe4e643e..5412a9d5953a 100644 --- a/processor/logstransformprocessor/config.go +++ b/processor/logstransformprocessor/config.go @@ -29,7 +29,7 @@ type Config struct { adapter.BaseConfig `mapstructure:",squash"` } -var _ component.ProcessorConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the processor configuration is valid func (cfg *Config) Validate() error { diff --git a/processor/logstransformprocessor/config_test.go b/processor/logstransformprocessor/config_test.go index b0320878c9dc..646029e6a247 100644 --- a/processor/logstransformprocessor/config_test.go +++ b/processor/logstransformprocessor/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) factory := NewFactory() cfg := factory.CreateDefaultConfig() - assert.NoError(t, component.UnmarshalProcessorConfig(cm, cfg)) + assert.NoError(t, component.UnmarshalConfig(cm, cfg)) assert.Equal(t, &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), BaseConfig: adapter.BaseConfig{ diff --git a/processor/logstransformprocessor/factory.go b/processor/logstransformprocessor/factory.go index 35c76925253d..a06a6e51ac01 100644 --- a/processor/logstransformprocessor/factory.go +++ b/processor/logstransformprocessor/factory.go @@ -45,7 +45,7 @@ func NewFactory() component.ProcessorFactory { } // Note: This isn't a valid configuration because the processor would do no work. -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), BaseConfig: adapter.BaseConfig{ @@ -57,7 +57,7 @@ func createDefaultConfig() component.ProcessorConfig { func createLogsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Logs) (component.LogsProcessor, error) { pCfg, ok := cfg.(*Config) if !ok { diff --git a/processor/logstransformprocessor/go.mod b/processor/logstransformprocessor/go.mod index db58c09efb36..ddf8bbfada95 100644 --- a/processor/logstransformprocessor/go.mod +++ b/processor/logstransformprocessor/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -30,7 +30,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/logstransformprocessor/go.sum b/processor/logstransformprocessor/go.sum index d8c28e097c47..b2f0fbc584fa 100644 --- a/processor/logstransformprocessor/go.sum +++ b/processor/logstransformprocessor/go.sum @@ -293,16 +293,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/processor/metricsgenerationprocessor/config_test.go b/processor/metricsgenerationprocessor/config_test.go index c0dab3ee7074..0ea21969c384 100644 --- a/processor/metricsgenerationprocessor/config_test.go +++ b/processor/metricsgenerationprocessor/config_test.go @@ -31,7 +31,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ProcessorConfig + expected component.Config errorMessage string }{ { @@ -97,7 +97,7 @@ func TestLoadConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) diff --git a/processor/metricsgenerationprocessor/factory.go b/processor/metricsgenerationprocessor/factory.go index 065f02bfdb4b..7845e78e3845 100644 --- a/processor/metricsgenerationprocessor/factory.go +++ b/processor/metricsgenerationprocessor/factory.go @@ -41,7 +41,7 @@ func NewFactory() component.ProcessorFactory { component.WithMetricsProcessor(createMetricsProcessor, stability)) } -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } @@ -50,7 +50,7 @@ func createDefaultConfig() component.ProcessorConfig { func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { processorConfig, ok := cfg.(*Config) diff --git a/processor/metricsgenerationprocessor/factory_test.go b/processor/metricsgenerationprocessor/factory_test.go index f7bbd641de1e..4b92995e1976 100644 --- a/processor/metricsgenerationprocessor/factory_test.go +++ b/processor/metricsgenerationprocessor/factory_test.go @@ -58,7 +58,7 @@ func TestCreateProcessors(t *testing.T) { sub, err := cm.Sub(k) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) tp, tErr := factory.CreateTracesProcessor( context.Background(), diff --git a/processor/metricsgenerationprocessor/go.mod b/processor/metricsgenerationprocessor/go.mod index 8d1ae2435ebe..5e271a68b750 100644 --- a/processor/metricsgenerationprocessor/go.mod +++ b/processor/metricsgenerationprocessor/go.mod @@ -4,10 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -27,7 +27,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/metricsgenerationprocessor/go.sum b/processor/metricsgenerationprocessor/go.sum index e90307f6fffd..c80d33698554 100644 --- a/processor/metricsgenerationprocessor/go.sum +++ b/processor/metricsgenerationprocessor/go.sum @@ -270,16 +270,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/metricstransformprocessor/config_test.go b/processor/metricstransformprocessor/config_test.go index b07c686c8881..a5e94a2ae39d 100644 --- a/processor/metricstransformprocessor/config_test.go +++ b/processor/metricstransformprocessor/config_test.go @@ -29,7 +29,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { configFile string id component.ID - expected component.ProcessorConfig + expected component.Config }{ { configFile: "config_full.yaml", @@ -166,7 +166,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/processor/metricstransformprocessor/factory.go b/processor/metricstransformprocessor/factory.go index 7811efd9d0c3..c8187e0e7a8f 100644 --- a/processor/metricstransformprocessor/factory.go +++ b/processor/metricstransformprocessor/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ProcessorFactory { component.WithMetricsProcessor(createMetricsProcessor, stability)) } -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } @@ -52,7 +52,7 @@ func createDefaultConfig() component.ProcessorConfig { func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { oCfg := cfg.(*Config) diff --git a/processor/metricstransformprocessor/factory_test.go b/processor/metricstransformprocessor/factory_test.go index 28f620e404d2..bb11ad73bf68 100644 --- a/processor/metricstransformprocessor/factory_test.go +++ b/processor/metricstransformprocessor/factory_test.go @@ -131,7 +131,7 @@ func TestCreateProcessors(t *testing.T) { sub, err := cm.Sub(k) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) tp, tErr := factory.CreateTracesProcessor( context.Background(), diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index 50a60b12c10a..c96be039b434 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -5,10 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -29,7 +29,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index e54a4ade0fc8..77a704ce7538 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -264,16 +264,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/probabilisticsamplerprocessor/config.go b/processor/probabilisticsamplerprocessor/config.go index d01c5713ebb6..2209b7f17879 100644 --- a/processor/probabilisticsamplerprocessor/config.go +++ b/processor/probabilisticsamplerprocessor/config.go @@ -33,7 +33,7 @@ type Config struct { HashSeed uint32 `mapstructure:"hash_seed"` } -var _ component.ProcessorConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the processor configuration is valid func (cfg *Config) Validate() error { diff --git a/processor/probabilisticsamplerprocessor/config_test.go b/processor/probabilisticsamplerprocessor/config_test.go index 66ac88332e77..449a3d22a930 100644 --- a/processor/probabilisticsamplerprocessor/config_test.go +++ b/processor/probabilisticsamplerprocessor/config_test.go @@ -30,7 +30,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ProcessorConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -56,7 +56,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/processor/probabilisticsamplerprocessor/factory.go b/processor/probabilisticsamplerprocessor/factory.go index fed452545d07..39730ee6e1f9 100644 --- a/processor/probabilisticsamplerprocessor/factory.go +++ b/processor/probabilisticsamplerprocessor/factory.go @@ -47,7 +47,7 @@ func NewFactory() component.ProcessorFactory { component.WithTracesProcessor(createTracesProcessor, stability)) } -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } @@ -57,7 +57,7 @@ func createDefaultConfig() component.ProcessorConfig { func createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { return newTracesProcessor(ctx, set, cfg.(*Config), nextConsumer) diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index 990dc66ffa58..48afae237a6b 100644 --- a/processor/probabilisticsamplerprocessor/go.mod +++ b/processor/probabilisticsamplerprocessor/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -28,7 +28,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/probabilisticsamplerprocessor/go.sum b/processor/probabilisticsamplerprocessor/go.sum index 65c723e26162..2245e7b18849 100644 --- a/processor/probabilisticsamplerprocessor/go.sum +++ b/processor/probabilisticsamplerprocessor/go.sum @@ -273,18 +273,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/processor/redactionprocessor/config_test.go b/processor/redactionprocessor/config_test.go index b4a6eb0011db..5855fd89e5b0 100644 --- a/processor/redactionprocessor/config_test.go +++ b/processor/redactionprocessor/config_test.go @@ -30,7 +30,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ProcessorConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -58,7 +58,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/processor/redactionprocessor/factory.go b/processor/redactionprocessor/factory.go index 9fb8c51968f5..b12884aeb609 100644 --- a/processor/redactionprocessor/factory.go +++ b/processor/redactionprocessor/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ProcessorFactory { ) } -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } @@ -50,7 +50,7 @@ func createDefaultConfig() component.ProcessorConfig { func createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, next consumer.Traces, ) (component.TracesProcessor, error) { oCfg := cfg.(*Config) diff --git a/processor/redactionprocessor/go.mod b/processor/redactionprocessor/go.mod index a924f9374ac7..d25b9d4115c6 100644 --- a/processor/redactionprocessor/go.mod +++ b/processor/redactionprocessor/go.mod @@ -4,10 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -28,7 +28,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/redactionprocessor/go.sum b/processor/redactionprocessor/go.sum index c4e31a24eff4..ea32c58d9257 100644 --- a/processor/redactionprocessor/go.sum +++ b/processor/redactionprocessor/go.sum @@ -271,16 +271,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/resourcedetectionprocessor/config.go b/processor/resourcedetectionprocessor/config.go index 77dc74309280..6410a40dee92 100644 --- a/processor/resourcedetectionprocessor/config.go +++ b/processor/resourcedetectionprocessor/config.go @@ -68,8 +68,3 @@ func (d *DetectorConfig) GetConfigFromType(detectorType internal.DetectorType) i return nil } } - -// Validate config -func (cfg *Config) Validate() error { - return cfg.DetectorConfig.SystemConfig.Validate() -} diff --git a/processor/resourcedetectionprocessor/config_test.go b/processor/resourcedetectionprocessor/config_test.go index 3f4605129972..8eaf172c236f 100644 --- a/processor/resourcedetectionprocessor/config_test.go +++ b/processor/resourcedetectionprocessor/config_test.go @@ -39,7 +39,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ProcessorConfig + expected component.Config errorMessage string }{ { @@ -95,7 +95,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) diff --git a/processor/resourcedetectionprocessor/factory.go b/processor/resourcedetectionprocessor/factory.go index 27bf789c71ed..fc0ce293bead 100644 --- a/processor/resourcedetectionprocessor/factory.go +++ b/processor/resourcedetectionprocessor/factory.go @@ -95,7 +95,7 @@ func (*factory) Type() component.Type { return typeStr } -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Detectors: []string{env.TypeStr}, @@ -116,7 +116,7 @@ func defaultHTTPClientSettings() confighttp.HTTPClientSettings { func (f *factory) createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { rdp, err := f.getResourceDetectionProcessor(set, cfg) @@ -137,7 +137,7 @@ func (f *factory) createTracesProcessor( func (f *factory) createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { rdp, err := f.getResourceDetectionProcessor(set, cfg) @@ -158,7 +158,7 @@ func (f *factory) createMetricsProcessor( func (f *factory) createLogsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Logs, ) (component.LogsProcessor, error) { rdp, err := f.getResourceDetectionProcessor(set, cfg) @@ -178,7 +178,7 @@ func (f *factory) createLogsProcessor( func (f *factory) getResourceDetectionProcessor( params component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, ) (*resourceDetectionProcessor, error) { oCfg := cfg.(*Config) diff --git a/processor/resourcedetectionprocessor/factory_test.go b/processor/resourcedetectionprocessor/factory_test.go index e9d1e7ed802e..31f7a80a8579 100644 --- a/processor/resourcedetectionprocessor/factory_test.go +++ b/processor/resourcedetectionprocessor/factory_test.go @@ -62,7 +62,7 @@ func TestCreateConfigProcessors(t *testing.T) { sub, err := cm.Sub(k) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) tt, err := factory.CreateTracesProcessor( context.Background(), diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index 34d9824508fa..75d8953d3204 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -12,11 +12,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 k8s.io/apimachinery v0.25.4 @@ -80,7 +80,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index 934ccb7bb96d..85c15a44296b 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -399,18 +399,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/processor/resourceprocessor/config.go b/processor/resourceprocessor/config.go index f3e6de422a03..cb7a84854f40 100644 --- a/processor/resourceprocessor/config.go +++ b/processor/resourceprocessor/config.go @@ -30,7 +30,7 @@ type Config struct { AttributesActions []attraction.ActionKeyValue `mapstructure:"attributes"` } -var _ component.ProcessorConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the processor configuration is valid func (cfg *Config) Validate() error { diff --git a/processor/resourceprocessor/config_test.go b/processor/resourceprocessor/config_test.go index 3d5059a2d14e..6acdf58938aa 100644 --- a/processor/resourceprocessor/config_test.go +++ b/processor/resourceprocessor/config_test.go @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ProcessorConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -61,7 +61,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/processor/resourceprocessor/factory.go b/processor/resourceprocessor/factory.go index e101cd371791..c953789ba09f 100644 --- a/processor/resourceprocessor/factory.go +++ b/processor/resourceprocessor/factory.go @@ -46,7 +46,7 @@ func NewFactory() component.ProcessorFactory { } // Note: This isn't a valid configuration because the processor would do no work. -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } @@ -55,7 +55,7 @@ func createDefaultConfig() component.ProcessorConfig { func createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Traces) (component.TracesProcessor, error) { attrProc, err := createAttrProcessor(cfg.(*Config)) if err != nil { @@ -74,7 +74,7 @@ func createTracesProcessor( func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Metrics) (component.MetricsProcessor, error) { attrProc, err := createAttrProcessor(cfg.(*Config)) if err != nil { @@ -93,7 +93,7 @@ func createMetricsProcessor( func createLogsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Logs) (component.LogsProcessor, error) { attrProc, err := createAttrProcessor(cfg.(*Config)) if err != nil { diff --git a/processor/resourceprocessor/go.mod b/processor/resourceprocessor/go.mod index 0c93819b0660..6acd86f9b01c 100644 --- a/processor/resourceprocessor/go.mod +++ b/processor/resourceprocessor/go.mod @@ -5,10 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -27,7 +27,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/resourceprocessor/go.sum b/processor/resourceprocessor/go.sum index b478491aa7c0..ea344580a376 100644 --- a/processor/resourceprocessor/go.sum +++ b/processor/resourceprocessor/go.sum @@ -260,16 +260,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/routingprocessor/config_test.go b/processor/routingprocessor/config_test.go index 727a6eb2e69d..aa09c70cc7ee 100644 --- a/processor/routingprocessor/config_test.go +++ b/processor/routingprocessor/config_test.go @@ -28,7 +28,7 @@ import ( func TestLoadConfig(t *testing.T) { testcases := []struct { configPath string - expected component.ProcessorConfig + expected component.Config }{ { configPath: "config_traces.yaml", @@ -99,7 +99,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) @@ -110,7 +110,7 @@ func TestLoadConfig(t *testing.T) { func TestValidateConfig(t *testing.T) { tests := []struct { name string - config component.ProcessorConfig + config component.Config error string }{ { diff --git a/processor/routingprocessor/factory.go b/processor/routingprocessor/factory.go index efd9f9de1dfe..26a92c9aed5f 100644 --- a/processor/routingprocessor/factory.go +++ b/processor/routingprocessor/factory.go @@ -41,24 +41,24 @@ func NewFactory() component.ProcessorFactory { ) } -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), AttributeSource: defaultAttributeSource, } } -func createTracesProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg component.ProcessorConfig, nextConsumer consumer.Traces) (component.TracesProcessor, error) { +func createTracesProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg component.Config, nextConsumer consumer.Traces) (component.TracesProcessor, error) { warnIfNotLastInPipeline(nextConsumer, params.Logger) return newTracesProcessor(params.TelemetrySettings, cfg), nil } -func createMetricsProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg component.ProcessorConfig, nextConsumer consumer.Metrics) (component.MetricsProcessor, error) { +func createMetricsProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg component.Config, nextConsumer consumer.Metrics) (component.MetricsProcessor, error) { warnIfNotLastInPipeline(nextConsumer, params.Logger) return newMetricProcessor(params.TelemetrySettings, cfg), nil } -func createLogsProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg component.ProcessorConfig, nextConsumer consumer.Logs) (component.LogsProcessor, error) { +func createLogsProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg component.Config, nextConsumer consumer.Logs) (component.LogsProcessor, error) { warnIfNotLastInPipeline(nextConsumer, params.Logger) return newLogProcessor(params.TelemetrySettings, cfg), nil } diff --git a/processor/routingprocessor/factory_test.go b/processor/routingprocessor/factory_test.go index 8b0f16fc1104..7f60126b4037 100644 --- a/processor/routingprocessor/factory_test.go +++ b/processor/routingprocessor/factory_test.go @@ -186,7 +186,7 @@ func TestProcessorDoesNotFailToBuildExportersWithMultiplePipelines(t *testing.T) sub, err := cm.Sub(k) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) exp := newMetricProcessor(component.TelemetrySettings{Logger: zap.NewNop()}, cfg) err = exp.Start(context.Background(), host) diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index b95df9969ef1..f42c305e7b4a 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -5,11 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.51.0 @@ -40,7 +40,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index 48a416405088..34fc078e978e 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -307,18 +307,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0 h1:uXNkGlAXHyvUZL51qsQR8hS8oSt80m1ncbqwXRRkJMk= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:3+YgPEDEyNzwiI+V9J2YBVGyV9Qppu4VPbB3jHeN8Ns= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/processor/routingprocessor/logs.go b/processor/routingprocessor/logs.go index b677aa0319ad..a4ba6c257088 100644 --- a/processor/routingprocessor/logs.go +++ b/processor/routingprocessor/logs.go @@ -38,7 +38,7 @@ type logProcessor struct { router router[component.LogsExporter, ottllog.TransformContext] } -func newLogProcessor(settings component.TelemetrySettings, config component.ProcessorConfig) *logProcessor { +func newLogProcessor(settings component.TelemetrySettings, config component.Config) *logProcessor { cfg := rewriteRoutingEntriesToOTTL(config.(*Config)) return &logProcessor{ diff --git a/processor/routingprocessor/metrics.go b/processor/routingprocessor/metrics.go index 2be5e4d69a6c..f5cbf02441da 100644 --- a/processor/routingprocessor/metrics.go +++ b/processor/routingprocessor/metrics.go @@ -38,7 +38,7 @@ type metricsProcessor struct { router router[component.MetricsExporter, ottldatapoint.TransformContext] } -func newMetricProcessor(settings component.TelemetrySettings, config component.ProcessorConfig) *metricsProcessor { +func newMetricProcessor(settings component.TelemetrySettings, config component.Config) *metricsProcessor { cfg := rewriteRoutingEntriesToOTTL(config.(*Config)) return &metricsProcessor{ diff --git a/processor/routingprocessor/router.go b/processor/routingprocessor/router.go index f308d7cb13dc..fd4e38d2dc60 100644 --- a/processor/routingprocessor/router.go +++ b/processor/routingprocessor/router.go @@ -41,7 +41,7 @@ type router[E component.Component, K any] struct { } // newRouter creates a new router instance with its type parameter constrained -// to component.Exporter. +// to component.Component. func newRouter[E component.Component, K any]( table []RoutingTableItem, defaultExporterIDs []string, diff --git a/processor/routingprocessor/traces.go b/processor/routingprocessor/traces.go index 23f7c6b2ec9b..70e6d24267d3 100644 --- a/processor/routingprocessor/traces.go +++ b/processor/routingprocessor/traces.go @@ -38,7 +38,7 @@ type tracesProcessor struct { router router[component.TracesExporter, ottlspan.TransformContext] } -func newTracesProcessor(settings component.TelemetrySettings, config component.ProcessorConfig) *tracesProcessor { +func newTracesProcessor(settings component.TelemetrySettings, config component.Config) *tracesProcessor { cfg := rewriteRoutingEntriesToOTTL(config.(*Config)) return &tracesProcessor{ diff --git a/processor/schemaprocessor/config_test.go b/processor/schemaprocessor/config_test.go index 4e719b9df74d..01378c8d1950 100644 --- a/processor/schemaprocessor/config_test.go +++ b/processor/schemaprocessor/config_test.go @@ -39,7 +39,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "with-all-options").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), diff --git a/processor/schemaprocessor/factory.go b/processor/schemaprocessor/factory.go index da9c7f70b4e6..680b5bf6b672 100644 --- a/processor/schemaprocessor/factory.go +++ b/processor/schemaprocessor/factory.go @@ -37,7 +37,7 @@ type factory struct{} // newDefaultConfiguration returns the configuration for schema transformer processor // with the default values being used throughout it -func newDefaultConfiguration() component.ProcessorConfig { +func newDefaultConfiguration() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.NewDefaultHTTPClientSettings(), @@ -58,7 +58,7 @@ func NewFactory() component.ProcessorFactory { func (f factory) createLogsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, next consumer.Logs, ) (component.LogsProcessor, error) { transformer, err := newTransformer(ctx, cfg, set) @@ -79,7 +79,7 @@ func (f factory) createLogsProcessor( func (f factory) createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, next consumer.Metrics, ) (component.MetricsProcessor, error) { transformer, err := newTransformer(ctx, cfg, set) @@ -100,7 +100,7 @@ func (f factory) createMetricsProcessor( func (f factory) createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, next consumer.Traces, ) (component.TracesProcessor, error) { transformer, err := newTransformer(ctx, cfg, set) diff --git a/processor/schemaprocessor/go.mod b/processor/schemaprocessor/go.mod index 390a379ddc7b..2306bb045c09 100644 --- a/processor/schemaprocessor/go.mod +++ b/processor/schemaprocessor/go.mod @@ -4,10 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -34,7 +34,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/processor/schemaprocessor/go.sum b/processor/schemaprocessor/go.sum index c51801e53a82..321a2ad37a4e 100644 --- a/processor/schemaprocessor/go.sum +++ b/processor/schemaprocessor/go.sum @@ -283,16 +283,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/processor/schemaprocessor/transformer.go b/processor/schemaprocessor/transformer.go index 83de2f5964ee..f9733946b8cc 100644 --- a/processor/schemaprocessor/transformer.go +++ b/processor/schemaprocessor/transformer.go @@ -32,7 +32,7 @@ type transformer struct { func newTransformer( _ context.Context, - conf component.ProcessorConfig, + conf component.Config, set component.ProcessorCreateSettings, ) (*transformer, error) { cfg, ok := conf.(*Config) diff --git a/processor/servicegraphprocessor/factory.go b/processor/servicegraphprocessor/factory.go index 13e396f6c14f..24129220cae5 100644 --- a/processor/servicegraphprocessor/factory.go +++ b/processor/servicegraphprocessor/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ProcessorFactory { ) } -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), Store: StoreConfig{ @@ -53,6 +53,6 @@ func createDefaultConfig() component.ProcessorConfig { } } -func createTracesProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg component.ProcessorConfig, nextConsumer consumer.Traces) (component.TracesProcessor, error) { +func createTracesProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg component.Config, nextConsumer consumer.Traces) (component.TracesProcessor, error) { return newProcessor(params.Logger, cfg, nextConsumer), nil } diff --git a/processor/servicegraphprocessor/go.mod b/processor/servicegraphprocessor/go.mod index 63fd7482f7dc..04caf5260d08 100644 --- a/processor/servicegraphprocessor/go.mod +++ b/processor/servicegraphprocessor/go.mod @@ -5,12 +5,12 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -60,8 +60,8 @@ require ( github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/processor/servicegraphprocessor/go.sum b/processor/servicegraphprocessor/go.sum index 065ad968656c..a6af35b86132 100644 --- a/processor/servicegraphprocessor/go.sum +++ b/processor/servicegraphprocessor/go.sum @@ -421,23 +421,23 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0 h1:uXNkGlAXHyvUZL51qsQR8hS8oSt80m1ncbqwXRRkJMk= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:3+YgPEDEyNzwiI+V9J2YBVGyV9Qppu4VPbB3jHeN8Ns= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/processor/servicegraphprocessor/processor.go b/processor/servicegraphprocessor/processor.go index 5fe0b3b3b89e..d37c50f8b89c 100644 --- a/processor/servicegraphprocessor/processor.go +++ b/processor/servicegraphprocessor/processor.go @@ -75,7 +75,7 @@ type processor struct { shutdownCh chan interface{} } -func newProcessor(logger *zap.Logger, config component.ProcessorConfig, nextConsumer consumer.Traces) *processor { +func newProcessor(logger *zap.Logger, config component.Config, nextConsumer consumer.Traces) *processor { pConfig := config.(*Config) bounds := defaultLatencyHistogramBucketsMs diff --git a/processor/spanmetricsprocessor/factory.go b/processor/spanmetricsprocessor/factory.go index f764c6700b57..f0d234d834b4 100644 --- a/processor/spanmetricsprocessor/factory.go +++ b/processor/spanmetricsprocessor/factory.go @@ -39,7 +39,7 @@ func NewFactory() component.ProcessorFactory { ) } -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), AggregationTemporality: "AGGREGATION_TEMPORALITY_CUMULATIVE", @@ -48,6 +48,6 @@ func createDefaultConfig() component.ProcessorConfig { } } -func createTracesProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg component.ProcessorConfig, nextConsumer consumer.Traces) (component.TracesProcessor, error) { +func createTracesProcessor(_ context.Context, params component.ProcessorCreateSettings, cfg component.Config, nextConsumer consumer.Traces) (component.TracesProcessor, error) { return newProcessor(params.Logger, cfg, nextConsumer) } diff --git a/processor/spanmetricsprocessor/go.mod b/processor/spanmetricsprocessor/go.mod index 3849a4f34f67..f5cca03a7412 100644 --- a/processor/spanmetricsprocessor/go.mod +++ b/processor/spanmetricsprocessor/go.mod @@ -9,15 +9,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0 - go.opentelemetry.io/collector/featuregate v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 google.golang.org/grpc v1.51.0 diff --git a/processor/spanmetricsprocessor/go.sum b/processor/spanmetricsprocessor/go.sum index bf2772ce8428..a6e7156cde47 100644 --- a/processor/spanmetricsprocessor/go.sum +++ b/processor/spanmetricsprocessor/go.sum @@ -599,25 +599,25 @@ go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0 h1:uXNkGlAXHyvUZL51qsQR8hS8oSt80m1ncbqwXRRkJMk= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:3+YgPEDEyNzwiI+V9J2YBVGyV9Qppu4VPbB3jHeN8Ns= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0 h1:ZHEOeGOIYIDTKhI9xs30/obFfhUbb9b2+e/eahp1fJA= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 h1:/+HfaoVPSXgHUZOTZSSriuKOQi8L/rgyb7TTRx5jzoo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= diff --git a/processor/spanmetricsprocessor/processor.go b/processor/spanmetricsprocessor/processor.go index 4d2d0dea7389..95cc86f4e811 100644 --- a/processor/spanmetricsprocessor/processor.go +++ b/processor/spanmetricsprocessor/processor.go @@ -113,7 +113,7 @@ type histogramData struct { exemplarsData []exemplarData } -func newProcessor(logger *zap.Logger, config component.ProcessorConfig, nextConsumer consumer.Traces) (*processorImp, error) { +func newProcessor(logger *zap.Logger, config component.Config, nextConsumer consumer.Traces) (*processorImp, error) { logger.Info("Building spanmetricsprocessor") pConfig := config.(*Config) diff --git a/processor/spanprocessor/config.go b/processor/spanprocessor/config.go index b98ee88c9e13..229e4c729333 100644 --- a/processor/spanprocessor/config.go +++ b/processor/spanprocessor/config.go @@ -93,7 +93,7 @@ type Status struct { Description string `mapstructure:"description"` } -var _ component.ProcessorConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks if the processor configuration is valid func (cfg *Config) Validate() error { diff --git a/processor/spanprocessor/config_test.go b/processor/spanprocessor/config_test.go index 990439b65c78..ae3db070da45 100644 --- a/processor/spanprocessor/config_test.go +++ b/processor/spanprocessor/config_test.go @@ -33,7 +33,7 @@ func TestLoadingConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ProcessorConfig + expected component.Config }{ { id: component.NewIDWithName("span", "custom"), @@ -126,7 +126,7 @@ func TestLoadingConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/processor/spanprocessor/factory.go b/processor/spanprocessor/factory.go index 2d691b147dfa..c8d4f5a3f980 100644 --- a/processor/spanprocessor/factory.go +++ b/processor/spanprocessor/factory.go @@ -59,7 +59,7 @@ func NewFactory() component.ProcessorFactory { component.WithTracesProcessor(createTracesProcessor, stability)) } -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), } @@ -68,7 +68,7 @@ func createDefaultConfig() component.ProcessorConfig { func createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { diff --git a/processor/spanprocessor/go.mod b/processor/spanprocessor/go.mod index 2922deb9902d..54f9f2100e37 100644 --- a/processor/spanprocessor/go.mod +++ b/processor/spanprocessor/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -29,7 +29,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/spanprocessor/go.sum b/processor/spanprocessor/go.sum index e50d94a34260..c72de8a766e8 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -263,18 +263,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/processor/tailsamplingprocessor/config_test.go b/processor/tailsamplingprocessor/config_test.go index 34b632178206..068eb1fc05c3 100644 --- a/processor/tailsamplingprocessor/config_test.go +++ b/processor/tailsamplingprocessor/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, cfg, diff --git a/processor/tailsamplingprocessor/factory.go b/processor/tailsamplingprocessor/factory.go index d6133bfea281..a37b1baef0b2 100644 --- a/processor/tailsamplingprocessor/factory.go +++ b/processor/tailsamplingprocessor/factory.go @@ -48,7 +48,7 @@ func NewFactory() component.ProcessorFactory { component.WithTracesProcessor(createTracesProcessor, stability)) } -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), DecisionWait: 30 * time.Second, @@ -59,7 +59,7 @@ func createDefaultConfig() component.ProcessorConfig { func createTracesProcessor( _ context.Context, params component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { tCfg := cfg.(*Config) diff --git a/processor/tailsamplingprocessor/factory_test.go b/processor/tailsamplingprocessor/factory_test.go index 75612a6bd43c..b61471bf0dd6 100644 --- a/processor/tailsamplingprocessor/factory_test.go +++ b/processor/tailsamplingprocessor/factory_test.go @@ -42,7 +42,7 @@ func TestCreateProcessor(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) params := componenttest.NewNopProcessorCreateSettings() tp, err := factory.CreateTracesProcessor(context.Background(), params, cfg, consumertest.NewNop()) diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index e6aa714ab8fd..40edea466686 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -8,10 +8,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.opentelemetry.io/otel/trace v1.11.1 go.uber.org/atomic v1.10.0 go.uber.org/goleak v1.2.0 @@ -32,7 +32,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.uber.org/multierr v1.8.0 // indirect diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index cb957ad8cbf0..7affc372917f 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -276,16 +276,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/processor/transformprocessor/config.go b/processor/transformprocessor/config.go index 48a9925bdc4c..f7dd49f11f7a 100644 --- a/processor/transformprocessor/config.go +++ b/processor/transformprocessor/config.go @@ -51,7 +51,7 @@ type SignalConfig struct { Statements []string `mapstructure:"statements"` } -var _ component.ProcessorConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) func (c *Config) Validate() error { if (len(c.Traces.Statements) > 0 || len(c.Metrics.Statements) > 0 || len(c.Logs.Statements) > 0) && diff --git a/processor/transformprocessor/config_test.go b/processor/transformprocessor/config_test.go index 24f37b426e85..2c9eb5c36533 100644 --- a/processor/transformprocessor/config_test.go +++ b/processor/transformprocessor/config_test.go @@ -31,7 +31,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ProcessorConfig + expected component.Config errorMessage string }{ { @@ -164,7 +164,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) assert.NoError(t, err) - assert.NoError(t, component.UnmarshalProcessorConfig(sub, cfg)) + assert.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) @@ -187,5 +187,5 @@ func Test_UnknownContextID(t *testing.T) { sub, err := cm.Sub(id.String()) assert.NoError(t, err) - assert.Error(t, component.UnmarshalProcessorConfig(sub, cfg)) + assert.Error(t, component.UnmarshalConfig(sub, cfg)) } diff --git a/processor/transformprocessor/factory.go b/processor/transformprocessor/factory.go index 462e83dae611..10f25a6523a0 100644 --- a/processor/transformprocessor/factory.go +++ b/processor/transformprocessor/factory.go @@ -46,7 +46,7 @@ func NewFactory() component.ProcessorFactory { ) } -func createDefaultConfig() component.ProcessorConfig { +func createDefaultConfig() component.Config { return &Config{ ProcessorSettings: config.NewProcessorSettings(component.NewID(typeStr)), OTTLConfig: OTTLConfig{ @@ -69,7 +69,7 @@ func createDefaultConfig() component.ProcessorConfig { func createLogsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Logs, ) (component.LogsProcessor, error) { oCfg := cfg.(*Config) @@ -90,7 +90,7 @@ func createLogsProcessor( func createTracesProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Traces, ) (component.TracesProcessor, error) { oCfg := cfg.(*Config) @@ -111,7 +111,7 @@ func createTracesProcessor( func createMetricsProcessor( ctx context.Context, set component.ProcessorCreateSettings, - cfg component.ProcessorConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsProcessor, error) { oCfg := cfg.(*Config) diff --git a/processor/transformprocessor/go.mod b/processor/transformprocessor/go.mod index cacca8df2d4b..d5c53c76ea8b 100644 --- a/processor/transformprocessor/go.mod +++ b/processor/transformprocessor/go.mod @@ -5,10 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -30,7 +30,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/processor/transformprocessor/go.sum b/processor/transformprocessor/go.sum index ef1358e64ada..9c5fddeec8ac 100644 --- a/processor/transformprocessor/go.sum +++ b/processor/transformprocessor/go.sum @@ -269,16 +269,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/activedirectorydsreceiver/config_test.go b/receiver/activedirectorydsreceiver/config_test.go index 493b0ec2fc37..76beef30095c 100644 --- a/receiver/activedirectorydsreceiver/config_test.go +++ b/receiver/activedirectorydsreceiver/config_test.go @@ -41,7 +41,7 @@ func TestLoadConfig(t *testing.T) { defaultMetricsSettings.ActiveDirectoryDsReplicationObjectRate.Enabled = false tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, "defaults"), @@ -66,7 +66,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(config.ReceiverSettings{}, metadata.MetricSettings{})); diff != "" { diff --git a/receiver/activedirectorydsreceiver/factory.go b/receiver/activedirectorydsreceiver/factory.go index 4262edde3897..8a3e55aa3b8c 100644 --- a/receiver/activedirectorydsreceiver/factory.go +++ b/receiver/activedirectorydsreceiver/factory.go @@ -38,7 +38,7 @@ func NewFactory() component.ReceiverFactory { ) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), diff --git a/receiver/activedirectorydsreceiver/factory_others.go b/receiver/activedirectorydsreceiver/factory_others.go index d4bda2f35045..111b40261729 100644 --- a/receiver/activedirectorydsreceiver/factory_others.go +++ b/receiver/activedirectorydsreceiver/factory_others.go @@ -30,7 +30,7 @@ var errReceiverNotSupported = fmt.Errorf("The '%s' receiver is only supported on func createMetricsReceiver( _ context.Context, _ component.ReceiverCreateSettings, - _ component.ReceiverConfig, + _ component.Config, _ consumer.Metrics, ) (component.MetricsReceiver, error) { return nil, errReceiverNotSupported diff --git a/receiver/activedirectorydsreceiver/factory_windows.go b/receiver/activedirectorydsreceiver/factory_windows.go index ad01f35fc49f..51661489fa92 100644 --- a/receiver/activedirectorydsreceiver/factory_windows.go +++ b/receiver/activedirectorydsreceiver/factory_windows.go @@ -31,7 +31,7 @@ var errConfigNotActiveDirectory = fmt.Errorf("config is not valid for the '%s' r func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - rConf component.ReceiverConfig, + rConf component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { c, ok := rConf.(*Config) diff --git a/receiver/activedirectorydsreceiver/go.mod b/receiver/activedirectorydsreceiver/go.mod index b779a1099dea..aa7b25d16446 100644 --- a/receiver/activedirectorydsreceiver/go.mod +++ b/receiver/activedirectorydsreceiver/go.mod @@ -7,10 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 ) @@ -28,7 +28,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/activedirectorydsreceiver/go.sum b/receiver/activedirectorydsreceiver/go.sum index 9e621159c014..2be3d47a415a 100644 --- a/receiver/activedirectorydsreceiver/go.sum +++ b/receiver/activedirectorydsreceiver/go.sum @@ -280,16 +280,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/aerospikereceiver/config_test.go b/receiver/aerospikereceiver/config_test.go index 149f4336de60..4662ce03e5db 100644 --- a/receiver/aerospikereceiver/config_test.go +++ b/receiver/aerospikereceiver/config_test.go @@ -143,7 +143,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "localhost:3000" diff --git a/receiver/aerospikereceiver/factory.go b/receiver/aerospikereceiver/factory.go index 45c3897e4978..5752bf08db12 100644 --- a/receiver/aerospikereceiver/factory.go +++ b/receiver/aerospikereceiver/factory.go @@ -47,7 +47,7 @@ func NewFactory() component.ReceiverFactory { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf component.ReceiverConfig, + rConf component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) @@ -72,7 +72,7 @@ func createMetricsReceiver( ) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), diff --git a/receiver/aerospikereceiver/go.mod b/receiver/aerospikereceiver/go.mod index dca92c265f7f..db552168304c 100644 --- a/receiver/aerospikereceiver/go.mod +++ b/receiver/aerospikereceiver/go.mod @@ -7,10 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -52,7 +52,7 @@ require ( github.com/stretchr/objx v0.5.0 // indirect github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/aerospikereceiver/go.sum b/receiver/aerospikereceiver/go.sum index 53b2057eebfd..fc5f5f9b91bf 100644 --- a/receiver/aerospikereceiver/go.sum +++ b/receiver/aerospikereceiver/go.sum @@ -834,16 +834,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/apachereceiver/config_test.go b/receiver/apachereceiver/config_test.go index d9b8e75bb643..72d9b44c8084 100644 --- a/receiver/apachereceiver/config_test.go +++ b/receiver/apachereceiver/config_test.go @@ -99,7 +99,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "http://localhost:8080/server-status?auto" diff --git a/receiver/apachereceiver/factory.go b/receiver/apachereceiver/factory.go index e856c667a7a6..fd2e8ee51fec 100644 --- a/receiver/apachereceiver/factory.go +++ b/receiver/apachereceiver/factory.go @@ -44,7 +44,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -78,7 +78,7 @@ func parseResourseAttributes(endpoint string) (string, string, error) { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf component.ReceiverConfig, + rConf component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index 81e170be41d1..713523f9e992 100644 --- a/receiver/apachereceiver/go.mod +++ b/receiver/apachereceiver/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/featuregate v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) diff --git a/receiver/apachereceiver/go.sum b/receiver/apachereceiver/go.sum index 2571b6a01c28..b906c7a4124e 100644 --- a/receiver/apachereceiver/go.sum +++ b/receiver/apachereceiver/go.sum @@ -828,16 +828,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/awscloudwatchreceiver/config_test.go b/receiver/awscloudwatchreceiver/config_test.go index 687c8ce2f3fa..37325d4c86c9 100644 --- a/receiver/awscloudwatchreceiver/config_test.go +++ b/receiver/awscloudwatchreceiver/config_test.go @@ -157,7 +157,7 @@ func TestLoadConfig(t *testing.T) { cases := []struct { name string - expectedConfig component.ReceiverConfig + expectedConfig component.Config }{ { name: "default", @@ -275,7 +275,7 @@ func TestLoadConfig(t *testing.T) { loaded, err := cm.Sub(component.NewIDWithName(typeStr, tc.name).String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(loaded, cfg)) + require.NoError(t, component.UnmarshalConfig(loaded, cfg)) require.Equal(t, cfg, tc.expectedConfig) require.NoError(t, component.ValidateConfig(cfg)) }) diff --git a/receiver/awscloudwatchreceiver/factory.go b/receiver/awscloudwatchreceiver/factory.go index 051f8447caf6..8c8d1ba71de6 100644 --- a/receiver/awscloudwatchreceiver/factory.go +++ b/receiver/awscloudwatchreceiver/factory.go @@ -39,7 +39,7 @@ func NewFactory() component.ReceiverFactory { func createLogsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - rConf component.ReceiverConfig, + rConf component.Config, consumer consumer.Logs, ) (component.LogsReceiver, error) { cfg := rConf.(*Config) @@ -47,7 +47,7 @@ func createLogsReceiver( return rcvr, nil } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Logs: &LogsConfig{ diff --git a/receiver/awscloudwatchreceiver/go.mod b/receiver/awscloudwatchreceiver/go.mod index f579726ee258..44e0085408b7 100644 --- a/receiver/awscloudwatchreceiver/go.mod +++ b/receiver/awscloudwatchreceiver/go.mod @@ -5,10 +5,10 @@ go 1.18 require ( github.com/aws/aws-sdk-go v1.44.145 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -27,7 +27,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/awscloudwatchreceiver/go.sum b/receiver/awscloudwatchreceiver/go.sum index 78d42d18342e..144d79ea2f64 100644 --- a/receiver/awscloudwatchreceiver/go.sum +++ b/receiver/awscloudwatchreceiver/go.sum @@ -263,16 +263,16 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/awscontainerinsightreceiver/config_test.go b/receiver/awscontainerinsightreceiver/config_test.go index 1808d2fba6ed..1ff380d87832 100644 --- a/receiver/awscontainerinsightreceiver/config_test.go +++ b/receiver/awscontainerinsightreceiver/config_test.go @@ -34,7 +34,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -59,7 +59,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/awscontainerinsightreceiver/factory.go b/receiver/awscontainerinsightreceiver/factory.go index 66d0ceeae3d6..66f430fc744b 100644 --- a/receiver/awscontainerinsightreceiver/factory.go +++ b/receiver/awscontainerinsightreceiver/factory.go @@ -56,7 +56,7 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig returns a default config for the receiver. -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: defaultCollectionInterval, @@ -71,7 +71,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - baseCfg component.ReceiverConfig, + baseCfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index b38ad5f3dde3..17e5690c66fe 100644 --- a/receiver/awscontainerinsightreceiver/go.mod +++ b/receiver/awscontainerinsightreceiver/go.mod @@ -13,10 +13,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.66.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 @@ -105,7 +105,7 @@ require ( github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852 // indirect github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index c9f233b30b8b..fefd9328297d 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -574,16 +574,16 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/awsecscontainermetricsreceiver/config_test.go b/receiver/awsecscontainermetricsreceiver/config_test.go index 64cdb005ba67..1e12721a1161 100644 --- a/receiver/awsecscontainermetricsreceiver/config_test.go +++ b/receiver/awsecscontainermetricsreceiver/config_test.go @@ -34,7 +34,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -56,7 +56,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/awsecscontainermetricsreceiver/factory.go b/receiver/awsecscontainermetricsreceiver/factory.go index 3b8806e67c8a..3402365809db 100644 --- a/receiver/awsecscontainermetricsreceiver/factory.go +++ b/receiver/awsecscontainermetricsreceiver/factory.go @@ -49,7 +49,7 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig returns a default config for the receiver. -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: defaultCollectionInterval, @@ -60,7 +60,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - baseCfg component.ReceiverConfig, + baseCfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { endpoint, err := endpoints.GetTMEV4FromEnv() diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index 8092abed0791..330ee991f25a 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -32,7 +32,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index e57e3f060767..62327c9241d8 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -271,18 +271,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/awsfirehosereceiver/config_test.go b/receiver/awsfirehosereceiver/config_test.go index c284710d378f..870fd51aab50 100644 --- a/receiver/awsfirehosereceiver/config_test.go +++ b/receiver/awsfirehosereceiver/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) diff --git a/receiver/awsfirehosereceiver/factory.go b/receiver/awsfirehosereceiver/factory.go index 4d96ea659be1..1ed55199735c 100644 --- a/receiver/awsfirehosereceiver/factory.go +++ b/receiver/awsfirehosereceiver/factory.go @@ -71,7 +71,7 @@ func defaultMetricsUnmarshalers(logger *zap.Logger) map[string]unmarshaler.Metri // createDefaultConfig creates a default config with the endpoint set // to port 8443 and the record type set to the CloudWatch metric stream. -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), RecordType: defaultRecordType, @@ -85,7 +85,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { return newMetricsReceiver(cfg.(*Config), set, defaultMetricsUnmarshalers(set.Logger), nextConsumer) diff --git a/receiver/awsfirehosereceiver/go.mod b/receiver/awsfirehosereceiver/go.mod index e5808e824b47..f6e2d46f9e3a 100644 --- a/receiver/awsfirehosereceiver/go.mod +++ b/receiver/awsfirehosereceiver/go.mod @@ -4,11 +4,11 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -33,7 +33,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/awsfirehosereceiver/go.sum b/receiver/awsfirehosereceiver/go.sum index 9bcc5fc8ad18..1b9ca3e0bd5c 100644 --- a/receiver/awsfirehosereceiver/go.sum +++ b/receiver/awsfirehosereceiver/go.sum @@ -277,18 +277,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/awsxrayreceiver/config_test.go b/receiver/awsxrayreceiver/config_test.go index 5cb840d340f4..f46a030c158c 100644 --- a/receiver/awsxrayreceiver/config_test.go +++ b/receiver/awsxrayreceiver/config_test.go @@ -38,7 +38,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewIDWithName(awsxray.TypeStr, ""), @@ -99,7 +99,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/awsxrayreceiver/factory.go b/receiver/awsxrayreceiver/factory.go index c3e1f98baefc..fab809ae82fb 100644 --- a/receiver/awsxrayreceiver/factory.go +++ b/receiver/awsxrayreceiver/factory.go @@ -35,7 +35,7 @@ func NewFactory() component.ReceiverFactory { component.WithTracesReceiver(createTracesReceiver, component.StabilityLevelBeta)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { // reference the existing default configurations provided // in the X-Ray daemon: // https://github.com/aws/aws-xray-daemon/blob/master/pkg/cfg/cfg.go#L99 @@ -54,7 +54,7 @@ func createDefaultConfig() component.ReceiverConfig { func createTracesReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Traces) (component.TracesReceiver, error) { rcfg := cfg.(*Config) return newReceiver(rcfg, consumer, params) diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index 888541f300e0..2cffd028034e 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -10,11 +10,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -48,7 +48,7 @@ require ( github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index 63a3ca233646..bf790aef2f0e 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -378,18 +378,18 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/azureblobreceiver/factory.go b/receiver/azureblobreceiver/factory.go index 6bf6652992df..9ee925fe99a3 100644 --- a/receiver/azureblobreceiver/factory.go +++ b/receiver/azureblobreceiver/factory.go @@ -54,7 +54,7 @@ func NewFactory() component.ReceiverFactory { component.WithLogsReceiver(f.createLogsReceiver, component.StabilityLevelBeta)) } -func (f *blobReceiverFactory) createDefaultConfig() component.ReceiverConfig { +func (f *blobReceiverFactory) createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Logs: LogsConfig{ContainerName: logsContainerName}, @@ -65,7 +65,7 @@ func (f *blobReceiverFactory) createDefaultConfig() component.ReceiverConfig { func (f *blobReceiverFactory) createLogsReceiver( ctx context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Logs, ) (component.LogsReceiver, error) { @@ -84,7 +84,7 @@ func (f *blobReceiverFactory) createLogsReceiver( func (f *blobReceiverFactory) createTracesReceiver( ctx context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { @@ -101,7 +101,7 @@ func (f *blobReceiverFactory) createTracesReceiver( func (f *blobReceiverFactory) getReceiver( set component.ReceiverCreateSettings, - cfg component.ReceiverConfig) (component.Component, error) { + cfg component.Config) (component.Component, error) { var err error r := f.receivers.GetOrAdd(cfg, func() component.Component { @@ -118,7 +118,7 @@ func (f *blobReceiverFactory) getReceiver( return nil } - var receiver component.Receiver + var receiver component.Component receiver, err = newReceiver(*receiverConfig, set, beh) return receiver }) diff --git a/receiver/azureblobreceiver/factory_test.go b/receiver/azureblobreceiver/factory_test.go index fb68c826cbbb..3955c96db77e 100644 --- a/receiver/azureblobreceiver/factory_test.go +++ b/receiver/azureblobreceiver/factory_test.go @@ -66,7 +66,7 @@ func TestTracesAndLogsReceiversAreSame(t *testing.T) { assert.Equal(t, logsReceiver, tracesReceiver) } -func getConfig() component.ReceiverConfig { +func getConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), ConnectionString: goodConnectionString, diff --git a/receiver/azureblobreceiver/go.mod b/receiver/azureblobreceiver/go.mod index dd84776a2674..121fa06690c2 100644 --- a/receiver/azureblobreceiver/go.mod +++ b/receiver/azureblobreceiver/go.mod @@ -7,10 +7,10 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -72,9 +72,9 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/receiver/azureblobreceiver/go.sum b/receiver/azureblobreceiver/go.sum index 661d65725342..f7ed08b7d07e 100644 --- a/receiver/azureblobreceiver/go.sum +++ b/receiver/azureblobreceiver/go.sum @@ -483,21 +483,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/receiver/azureeventhubreceiver/factory.go b/receiver/azureeventhubreceiver/factory.go index 253701dd6395..3729a9c8d40a 100644 --- a/receiver/azureeventhubreceiver/factory.go +++ b/receiver/azureeventhubreceiver/factory.go @@ -38,11 +38,11 @@ func NewFactory() component.ReceiverFactory { component.WithLogsReceiver(createLogsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr))} } -func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSettings, receiver component.ReceiverConfig, logs consumer.Logs) (component.LogsReceiver, error) { +func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSettings, receiver component.Config, logs consumer.Logs) (component.LogsReceiver, error) { obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ ReceiverID: receiver.ID(), diff --git a/receiver/azureeventhubreceiver/go.mod b/receiver/azureeventhubreceiver/go.mod index 4be23a43f56b..62fc62eeed6d 100644 --- a/receiver/azureeventhubreceiver/go.mod +++ b/receiver/azureeventhubreceiver/go.mod @@ -8,10 +8,10 @@ require ( github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -67,9 +67,9 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/receiver/azureeventhubreceiver/go.sum b/receiver/azureeventhubreceiver/go.sum index e80ba1fbe23f..21849233dbc7 100644 --- a/receiver/azureeventhubreceiver/go.sum +++ b/receiver/azureeventhubreceiver/go.sum @@ -484,21 +484,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/receiver/bigipreceiver/config_test.go b/receiver/bigipreceiver/config_test.go index f6f13a9c0e0e..2136927153fc 100644 --- a/receiver/bigipreceiver/config_test.go +++ b/receiver/bigipreceiver/config_test.go @@ -137,7 +137,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Username = "otelu" diff --git a/receiver/bigipreceiver/factory.go b/receiver/bigipreceiver/factory.go index b4a08ec1305a..b4b5075537a5 100644 --- a/receiver/bigipreceiver/factory.go +++ b/receiver/bigipreceiver/factory.go @@ -44,7 +44,7 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig creates a config for Big-IP with as many default values as possible -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -59,7 +59,7 @@ func createDefaultConfig() component.ReceiverConfig { } // creates the metric receiver for Big-IP -func createMetricsReceiver(_ context.Context, params component.ReceiverCreateSettings, rConf component.ReceiverConfig, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(_ context.Context, params component.ReceiverCreateSettings, rConf component.Config, consumer consumer.Metrics) (component.MetricsReceiver, error) { cfg, ok := rConf.(*Config) if !ok { return nil, errConfigNotBigip diff --git a/receiver/bigipreceiver/factory_test.go b/receiver/bigipreceiver/factory_test.go index 68657b71f491..b5845476bcfc 100644 --- a/receiver/bigipreceiver/factory_test.go +++ b/receiver/bigipreceiver/factory_test.go @@ -47,7 +47,7 @@ func TestNewFactory(t *testing.T) { testFunc: func(t *testing.T) { factory := NewFactory() - var expectedCfg component.ReceiverConfig = &Config{ + var expectedCfg component.Config = &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, diff --git a/receiver/bigipreceiver/go.mod b/receiver/bigipreceiver/go.mod index d7c1ed52a8fe..e0055726e623 100644 --- a/receiver/bigipreceiver/go.mod +++ b/receiver/bigipreceiver/go.mod @@ -5,10 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -35,7 +35,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/bigipreceiver/go.sum b/receiver/bigipreceiver/go.sum index 151840e4fede..041c5a1d5d4b 100644 --- a/receiver/bigipreceiver/go.sum +++ b/receiver/bigipreceiver/go.sum @@ -292,16 +292,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/carbonreceiver/config_test.go b/receiver/carbonreceiver/config_test.go index e91fc7e271c6..a22e056ee54c 100644 --- a/receiver/carbonreceiver/config_test.go +++ b/receiver/carbonreceiver/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -98,7 +98,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/carbonreceiver/factory.go b/receiver/carbonreceiver/factory.go index d4ed1811c8ec..505f205a0a6b 100644 --- a/receiver/carbonreceiver/factory.go +++ b/receiver/carbonreceiver/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), NetAddr: confignet.NetAddr{ @@ -61,7 +61,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index d38988f8f84e..65f35f8f8e70 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -8,9 +8,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 ) @@ -42,9 +42,9 @@ require ( github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index c90e728c8ca3..7443e5eaefd0 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -374,18 +374,18 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/chronyreceiver/config.go b/receiver/chronyreceiver/config.go index de5abc7748d6..80786b3b6e63 100644 --- a/receiver/chronyreceiver/config.go +++ b/receiver/chronyreceiver/config.go @@ -42,12 +42,12 @@ type Config struct { } var ( - _ component.ReceiverConfig = (*Config)(nil) + _ component.Config = (*Config)(nil) errInvalidValue = errors.New("invalid value") ) -func newDefaultCongfig() component.ReceiverConfig { +func newDefaultCongfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(typeStr), MetricsSettings: metadata.DefaultMetricsSettings(), diff --git a/receiver/chronyreceiver/config_test.go b/receiver/chronyreceiver/config_test.go index 332ee25ea7f6..bf94ed21f7a9 100644 --- a/receiver/chronyreceiver/config_test.go +++ b/receiver/chronyreceiver/config_test.go @@ -42,7 +42,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "custom").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, &Config{ ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(typeStr), diff --git a/receiver/chronyreceiver/factory.go b/receiver/chronyreceiver/factory.go index b078539644af..a2487b27db8d 100644 --- a/receiver/chronyreceiver/factory.go +++ b/receiver/chronyreceiver/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ReceiverFactory { func newMetricsReceiver( ctx context.Context, set component.ReceiverCreateSettings, - rCfg component.ReceiverConfig, + rCfg component.Config, consumer consumer.Metrics) (component.MetricsReceiver, error) { cfg, ok := rCfg.(*Config) if !ok { diff --git a/receiver/chronyreceiver/go.mod b/receiver/chronyreceiver/go.mod index a5f54a0c9ba8..e9167ee210a6 100644 --- a/receiver/chronyreceiver/go.mod +++ b/receiver/chronyreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/facebook/time v0.0.0-20220713225404-f7a0d7702d50 github.com/stretchr/testify v1.8.1 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 ) @@ -29,7 +29,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/chronyreceiver/go.sum b/receiver/chronyreceiver/go.sum index d468b6d345e3..77ba1c42d40f 100644 --- a/receiver/chronyreceiver/go.sum +++ b/receiver/chronyreceiver/go.sum @@ -288,16 +288,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/cloudfoundryreceiver/config_test.go b/receiver/cloudfoundryreceiver/config_test.go index 38a19eb6a361..ea059a654b17 100644 --- a/receiver/cloudfoundryreceiver/config_test.go +++ b/receiver/cloudfoundryreceiver/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config errorMessage string }{ { @@ -82,7 +82,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) diff --git a/receiver/cloudfoundryreceiver/factory.go b/receiver/cloudfoundryreceiver/factory.go index b349ede29b56..39c19ea590fd 100644 --- a/receiver/cloudfoundryreceiver/factory.go +++ b/receiver/cloudfoundryreceiver/factory.go @@ -42,7 +42,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), RLPGateway: RLPGatewayConfig{ @@ -69,7 +69,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { c := cfg.(*Config) diff --git a/receiver/cloudfoundryreceiver/go.mod b/receiver/cloudfoundryreceiver/go.mod index 54adac5f4ce1..932884b3076b 100644 --- a/receiver/cloudfoundryreceiver/go.mod +++ b/receiver/cloudfoundryreceiver/go.mod @@ -6,10 +6,10 @@ require ( code.cloudfoundry.org/go-loggregator v7.4.0+incompatible github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -39,7 +39,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/cloudfoundryreceiver/go.sum b/receiver/cloudfoundryreceiver/go.sum index 32b30fb877b3..038f772ee58a 100644 --- a/receiver/cloudfoundryreceiver/go.sum +++ b/receiver/cloudfoundryreceiver/go.sum @@ -320,16 +320,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/collectdreceiver/config_test.go b/receiver/collectdreceiver/config_test.go index 6917cf509686..db446ddae9c6 100644 --- a/receiver/collectdreceiver/config_test.go +++ b/receiver/collectdreceiver/config_test.go @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -62,7 +62,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/collectdreceiver/factory.go b/receiver/collectdreceiver/factory.go index f9394d0cf1b0..d38adec19fdc 100644 --- a/receiver/collectdreceiver/factory.go +++ b/receiver/collectdreceiver/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ReceiverFactory { createDefaultConfig, component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), TCPAddr: confignet.TCPAddr{ @@ -57,7 +57,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { c := cfg.(*Config) diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index 1b77544d73a8..607c9950583d 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -8,9 +8,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 ) @@ -30,9 +30,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index b1efb7bda5ad..2493c4af4c93 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -263,18 +263,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/couchdbreceiver/config_test.go b/receiver/couchdbreceiver/config_test.go index e552f53077fc..971d667ed7a4 100644 --- a/receiver/couchdbreceiver/config_test.go +++ b/receiver/couchdbreceiver/config_test.go @@ -112,7 +112,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "http://localhost:5984" diff --git a/receiver/couchdbreceiver/factory.go b/receiver/couchdbreceiver/factory.go index eaca73d7f1aa..5451ed48f62c 100644 --- a/receiver/couchdbreceiver/factory.go +++ b/receiver/couchdbreceiver/factory.go @@ -41,7 +41,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ Metrics: metadata.DefaultMetricsSettings(), ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ @@ -59,7 +59,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf component.ReceiverConfig, + rConf component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) diff --git a/receiver/couchdbreceiver/go.mod b/receiver/couchdbreceiver/go.mod index 05ae8d755c63..9bab3544c7c4 100644 --- a/receiver/couchdbreceiver/go.mod +++ b/receiver/couchdbreceiver/go.mod @@ -5,10 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -37,7 +37,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/couchdbreceiver/go.sum b/receiver/couchdbreceiver/go.sum index 84db9faa97d3..c9076532a250 100644 --- a/receiver/couchdbreceiver/go.sum +++ b/receiver/couchdbreceiver/go.sum @@ -295,16 +295,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/dockerstatsreceiver/config.go b/receiver/dockerstatsreceiver/config.go index 3a17f6a5aeee..c07f1ed976fa 100644 --- a/receiver/dockerstatsreceiver/config.go +++ b/receiver/dockerstatsreceiver/config.go @@ -25,7 +25,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver/internal/metadata" ) -var _ component.ReceiverConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` diff --git a/receiver/dockerstatsreceiver/config_test.go b/receiver/dockerstatsreceiver/config_test.go index 623b9ba2577c..ec7645155020 100644 --- a/receiver/dockerstatsreceiver/config_test.go +++ b/receiver/dockerstatsreceiver/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -93,7 +93,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(config.ReceiverSettings{}, metadata.MetricSettings{})); diff != "" { diff --git a/receiver/dockerstatsreceiver/factory.go b/receiver/dockerstatsreceiver/factory.go index 12fd18c4b2fb..81c8360159b3 100644 --- a/receiver/dockerstatsreceiver/factory.go +++ b/receiver/dockerstatsreceiver/factory.go @@ -47,7 +47,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { scs := scraperhelper.NewDefaultScraperControllerSettings(typeStr) scs.CollectionInterval = 10 * time.Second return &Config{ @@ -62,7 +62,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - config component.ReceiverConfig, + config component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { dockerConfig := config.(*Config) diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index 56c013ba63f7..1e2248950284 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -9,12 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/featuregate v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index 28adde93af53..95ccb99700f4 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -824,18 +824,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/dotnetdiagnosticsreceiver/config_test.go b/receiver/dotnetdiagnosticsreceiver/config_test.go index 6daed7a01385..270dd7f8b647 100644 --- a/receiver/dotnetdiagnosticsreceiver/config_test.go +++ b/receiver/dotnetdiagnosticsreceiver/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, &Config{ PID: 1234, diff --git a/receiver/dotnetdiagnosticsreceiver/factory.go b/receiver/dotnetdiagnosticsreceiver/factory.go index 47c8cd5ce02e..052f80ee425f 100644 --- a/receiver/dotnetdiagnosticsreceiver/factory.go +++ b/receiver/dotnetdiagnosticsreceiver/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ReceiverFactory { ) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -56,7 +56,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - baseConfig component.ReceiverConfig, + baseConfig component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := baseConfig.(*Config) diff --git a/receiver/dotnetdiagnosticsreceiver/go.mod b/receiver/dotnetdiagnosticsreceiver/go.mod index 03f3c7575642..403ec4fce2a4 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.mod +++ b/receiver/dotnetdiagnosticsreceiver/go.mod @@ -4,10 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -27,7 +27,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/dotnetdiagnosticsreceiver/go.sum b/receiver/dotnetdiagnosticsreceiver/go.sum index 7f10dc1be3bd..adafaba3226a 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.sum +++ b/receiver/dotnetdiagnosticsreceiver/go.sum @@ -284,16 +284,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/elasticsearchreceiver/config_test.go b/receiver/elasticsearchreceiver/config_test.go index 857e5ae2c7a5..b5f141016073 100644 --- a/receiver/elasticsearchreceiver/config_test.go +++ b/receiver/elasticsearchreceiver/config_test.go @@ -160,7 +160,7 @@ func TestLoadConfig(t *testing.T) { defaultMetrics.ElasticsearchNodeFsDiskAvailable.Enabled = false tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, "defaults"), @@ -194,7 +194,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) if diff := cmp.Diff(tt.expected, cfg, cmpopts.IgnoreUnexported(config.ReceiverSettings{}, metadata.MetricSettings{})); diff != "" { diff --git a/receiver/elasticsearchreceiver/factory.go b/receiver/elasticsearchreceiver/factory.go index 997ca5960dab..30be17ef4a2f 100644 --- a/receiver/elasticsearchreceiver/factory.go +++ b/receiver/elasticsearchreceiver/factory.go @@ -44,7 +44,7 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig creates the default elasticsearchreceiver config. -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -66,7 +66,7 @@ var errConfigNotES = errors.New("config was not an elasticsearch receiver config func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf component.ReceiverConfig, + rConf component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { c, ok := rConf.(*Config) diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod index 2f783485e626..77ce8ce1a02f 100644 --- a/receiver/elasticsearchreceiver/go.mod +++ b/receiver/elasticsearchreceiver/go.mod @@ -8,11 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/featuregate v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/receiver/elasticsearchreceiver/go.sum b/receiver/elasticsearchreceiver/go.sum index c575b6f193aa..6257b9b89177 100644 --- a/receiver/elasticsearchreceiver/go.sum +++ b/receiver/elasticsearchreceiver/go.sum @@ -832,16 +832,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/expvarreceiver/config.go b/receiver/expvarreceiver/config.go index 89bfe3c7c789..2f39659decb1 100644 --- a/receiver/expvarreceiver/config.go +++ b/receiver/expvarreceiver/config.go @@ -31,7 +31,7 @@ type Config struct { MetricsConfig metadata.MetricsSettings `mapstructure:"metrics"` } -var _ component.ReceiverConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) func (c *Config) Validate() error { u, err := url.Parse(c.Endpoint) diff --git a/receiver/expvarreceiver/config_test.go b/receiver/expvarreceiver/config_test.go index 9960a6e32e86..ca6e7588b0f2 100644 --- a/receiver/expvarreceiver/config_test.go +++ b/receiver/expvarreceiver/config_test.go @@ -42,7 +42,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config errorMessage string }{ { @@ -87,7 +87,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expected == nil { assert.EqualError(t, component.ValidateConfig(cfg), tt.errorMessage) diff --git a/receiver/expvarreceiver/factory.go b/receiver/expvarreceiver/factory.go index 4de1fc01acaa..3078f0214d88 100644 --- a/receiver/expvarreceiver/factory.go +++ b/receiver/expvarreceiver/factory.go @@ -44,7 +44,7 @@ func NewFactory() component.ReceiverFactory { func newMetricsReceiver( _ context.Context, set component.ReceiverCreateSettings, - rCfg component.ReceiverConfig, + rCfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rCfg.(*Config) @@ -67,7 +67,7 @@ func newMetricsReceiver( ) } -func newDefaultConfig() component.ReceiverConfig { +func newDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(typeStr), HTTPClientSettings: confighttp.HTTPClientSettings{ diff --git a/receiver/expvarreceiver/go.mod b/receiver/expvarreceiver/go.mod index 110a610764ee..3894688cee1e 100644 --- a/receiver/expvarreceiver/go.mod +++ b/receiver/expvarreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/google/go-cmp v0.5.9 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -32,7 +32,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/expvarreceiver/go.sum b/receiver/expvarreceiver/go.sum index 35e0bc068d81..ac086592ba10 100644 --- a/receiver/expvarreceiver/go.sum +++ b/receiver/expvarreceiver/go.sum @@ -291,16 +291,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/filelogreceiver/filelog.go b/receiver/filelogreceiver/filelog.go index 3a76fce4225a..aedcde7d7349 100644 --- a/receiver/filelogreceiver/filelog.go +++ b/receiver/filelogreceiver/filelog.go @@ -43,7 +43,7 @@ func (f ReceiverType) Type() component.Type { } // CreateDefaultConfig creates a config with type and version -func (f ReceiverType) CreateDefaultConfig() component.ReceiverConfig { +func (f ReceiverType) CreateDefaultConfig() component.Config { return createDefaultConfig() } func createDefaultConfig() *FileLogConfig { @@ -57,7 +57,7 @@ func createDefaultConfig() *FileLogConfig { } // BaseConfig gets the base config from config, for now -func (f ReceiverType) BaseConfig(cfg component.ReceiverConfig) adapter.BaseConfig { +func (f ReceiverType) BaseConfig(cfg component.Config) adapter.BaseConfig { return cfg.(*FileLogConfig).BaseConfig } @@ -68,6 +68,6 @@ type FileLogConfig struct { } // InputConfig unmarshals the input operator -func (f ReceiverType) InputConfig(cfg component.ReceiverConfig) operator.Config { +func (f ReceiverType) InputConfig(cfg component.Config) operator.Config { return operator.NewConfig(&cfg.(*FileLogConfig).InputConfig) } diff --git a/receiver/filelogreceiver/filelog_test.go b/receiver/filelogreceiver/filelog_test.go index afb1f596260f..ecc3ad05cf87 100644 --- a/receiver/filelogreceiver/filelog_test.go +++ b/receiver/filelogreceiver/filelog_test.go @@ -60,7 +60,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewID("filelog").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, testdataConfigYaml(), cfg) diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index a9e1ed601183..4946f34ceb3c 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -7,10 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -31,7 +31,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index ebfef61239b8..bad9309f9f99 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -303,16 +303,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/flinkmetricsreceiver/config_test.go b/receiver/flinkmetricsreceiver/config_test.go index 518aa3c997ff..e042c70146cb 100644 --- a/receiver/flinkmetricsreceiver/config_test.go +++ b/receiver/flinkmetricsreceiver/config_test.go @@ -75,7 +75,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "http://localhost:8081" diff --git a/receiver/flinkmetricsreceiver/factory.go b/receiver/flinkmetricsreceiver/factory.go index faa133122961..f4fd07796a0e 100644 --- a/receiver/flinkmetricsreceiver/factory.go +++ b/receiver/flinkmetricsreceiver/factory.go @@ -44,7 +44,7 @@ func NewFactory() component.ReceiverFactory { ) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -61,7 +61,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf component.ReceiverConfig, + rConf component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg, ok := rConf.(*Config) diff --git a/receiver/flinkmetricsreceiver/factory_test.go b/receiver/flinkmetricsreceiver/factory_test.go index 83a0dc87081c..4cea0ac746b2 100644 --- a/receiver/flinkmetricsreceiver/factory_test.go +++ b/receiver/flinkmetricsreceiver/factory_test.go @@ -47,7 +47,7 @@ func TestNewFactory(t *testing.T) { testFunc: func(t *testing.T) { factory := NewFactory() - var expectedCfg component.ReceiverConfig = &Config{ + var expectedCfg component.Config = &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, diff --git a/receiver/flinkmetricsreceiver/go.mod b/receiver/flinkmetricsreceiver/go.mod index a21e3f5893f9..7f5816f1f8da 100644 --- a/receiver/flinkmetricsreceiver/go.mod +++ b/receiver/flinkmetricsreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -55,7 +55,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/flinkmetricsreceiver/go.sum b/receiver/flinkmetricsreceiver/go.sum index 02c50a80ef58..165b7b550349 100644 --- a/receiver/flinkmetricsreceiver/go.sum +++ b/receiver/flinkmetricsreceiver/go.sum @@ -828,16 +828,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/fluentforwardreceiver/config_test.go b/receiver/fluentforwardreceiver/config_test.go index e983a4d2dc89..58d4f04887ba 100644 --- a/receiver/fluentforwardreceiver/config_test.go +++ b/receiver/fluentforwardreceiver/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewID("fluentforward").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, factory.CreateDefaultConfig(), cfg) diff --git a/receiver/fluentforwardreceiver/factory.go b/receiver/fluentforwardreceiver/factory.go index a6d61530ac98..7a997da75ca6 100644 --- a/receiver/fluentforwardreceiver/factory.go +++ b/receiver/fluentforwardreceiver/factory.go @@ -37,7 +37,7 @@ func NewFactory() component.ReceiverFactory { component.WithLogsReceiver(createLogsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), } @@ -46,7 +46,7 @@ func createDefaultConfig() component.ReceiverConfig { func createLogsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Logs, ) (component.LogsReceiver, error) { diff --git a/receiver/fluentforwardreceiver/go.mod b/receiver/fluentforwardreceiver/go.mod index 6e1b720fddd0..d5f1088fd3d4 100644 --- a/receiver/fluentforwardreceiver/go.mod +++ b/receiver/fluentforwardreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/stretchr/testify v1.8.1 github.com/tinylib/msgp v1.1.6 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -29,7 +29,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/philhofer/fwd v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/fluentforwardreceiver/go.sum b/receiver/fluentforwardreceiver/go.sum index e52b8f9ec93a..1a91b6d961d9 100644 --- a/receiver/fluentforwardreceiver/go.sum +++ b/receiver/fluentforwardreceiver/go.sum @@ -274,16 +274,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/googlecloudpubsubreceiver/config_test.go b/receiver/googlecloudpubsubreceiver/config_test.go index 41552befff9d..de50ca1ea3c5 100644 --- a/receiver/googlecloudpubsubreceiver/config_test.go +++ b/receiver/googlecloudpubsubreceiver/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config expectedErr error }{ { @@ -64,7 +64,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/googlecloudpubsubreceiver/factory.go b/receiver/googlecloudpubsubreceiver/factory.go index 23183aa9ecdd..627ba8ca1f26 100644 --- a/receiver/googlecloudpubsubreceiver/factory.go +++ b/receiver/googlecloudpubsubreceiver/factory.go @@ -48,13 +48,13 @@ type pubsubReceiverFactory struct { receivers map[*Config]*pubsubReceiver } -func (factory *pubsubReceiverFactory) CreateDefaultConfig() component.ReceiverConfig { +func (factory *pubsubReceiverFactory) CreateDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), } } -func (factory *pubsubReceiverFactory) ensureReceiver(params component.ReceiverCreateSettings, config component.ReceiverConfig) (*pubsubReceiver, error) { +func (factory *pubsubReceiverFactory) ensureReceiver(params component.ReceiverCreateSettings, config component.Config) (*pubsubReceiver, error) { receiver := factory.receivers[config.(*Config)] if receiver != nil { return receiver, nil @@ -81,7 +81,7 @@ func (factory *pubsubReceiverFactory) ensureReceiver(params component.ReceiverCr func (factory *pubsubReceiverFactory) CreateTracesReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Traces) (component.TracesReceiver, error) { if consumer == nil { @@ -102,7 +102,7 @@ func (factory *pubsubReceiverFactory) CreateTracesReceiver( func (factory *pubsubReceiverFactory) CreateMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Metrics) (component.MetricsReceiver, error) { if consumer == nil { @@ -123,7 +123,7 @@ func (factory *pubsubReceiverFactory) CreateMetricsReceiver( func (factory *pubsubReceiverFactory) CreateLogsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Logs) (component.LogsReceiver, error) { if consumer == nil { diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index 50948b5f286f..00d7b1dab24d 100644 --- a/receiver/googlecloudpubsubreceiver/go.mod +++ b/receiver/googlecloudpubsubreceiver/go.mod @@ -5,10 +5,10 @@ go 1.18 require ( cloud.google.com/go/pubsub v1.26.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 google.golang.org/api v0.103.0 @@ -42,7 +42,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/googlecloudpubsubreceiver/go.sum b/receiver/googlecloudpubsubreceiver/go.sum index a2ccaf1e1d31..49265092480c 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -297,16 +297,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/googlecloudspannerreceiver/config_test.go b/receiver/googlecloudspannerreceiver/config_test.go index 77616a99cbe2..ef819144a78b 100644 --- a/receiver/googlecloudspannerreceiver/config_test.go +++ b/receiver/googlecloudspannerreceiver/config_test.go @@ -39,7 +39,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, &Config{ diff --git a/receiver/googlecloudspannerreceiver/factory.go b/receiver/googlecloudspannerreceiver/factory.go index 7b8b877fd3df..234a8735bc6b 100644 --- a/receiver/googlecloudspannerreceiver/factory.go +++ b/receiver/googlecloudspannerreceiver/factory.go @@ -41,7 +41,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -56,7 +56,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, settings component.ReceiverCreateSettings, - baseCfg component.ReceiverConfig, + baseCfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index dd6129b17387..96811f9217d4 100644 --- a/receiver/googlecloudspannerreceiver/go.mod +++ b/receiver/googlecloudspannerreceiver/go.mod @@ -7,10 +7,10 @@ require ( github.com/ReneKroon/ttlcache/v2 v2.11.0 github.com/mitchellh/hashstructure v1.1.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 google.golang.org/api v0.103.0 google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c @@ -50,7 +50,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/googlecloudspannerreceiver/go.sum b/receiver/googlecloudspannerreceiver/go.sum index 1bf5e3a046b6..0a1fbcbef82b 100644 --- a/receiver/googlecloudspannerreceiver/go.sum +++ b/receiver/googlecloudspannerreceiver/go.sum @@ -321,16 +321,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/hostmetricsreceiver/config.go b/receiver/hostmetricsreceiver/config.go index 3843a7ba0d89..43878f43a768 100644 --- a/receiver/hostmetricsreceiver/config.go +++ b/receiver/hostmetricsreceiver/config.go @@ -38,7 +38,7 @@ type Config struct { RootPath string `mapstructure:"root_path"` } -var _ component.ReceiverConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) var _ confmap.Unmarshaler = (*Config)(nil) // Validate checks the receiver configuration is valid diff --git a/receiver/hostmetricsreceiver/factory.go b/receiver/hostmetricsreceiver/factory.go index a4be3be3020c..b2176ba1cd66 100644 --- a/receiver/hostmetricsreceiver/factory.go +++ b/receiver/hostmetricsreceiver/factory.go @@ -75,7 +75,7 @@ func getScraperFactory(key string) (internal.ScraperFactory, bool) { } // createDefaultConfig creates the default configuration for receiver. -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(typeStr)} } @@ -83,7 +83,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( ctx context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { oCfg := cfg.(*Config) diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index 5879b2c47438..3393b9c2a923 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.66.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 golang.org/x/sys v0.2.0 @@ -55,8 +55,8 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/receiver/hostmetricsreceiver/go.sum b/receiver/hostmetricsreceiver/go.sum index 8d15c3e2e71a..c89692db828f 100644 --- a/receiver/hostmetricsreceiver/go.sum +++ b/receiver/hostmetricsreceiver/go.sum @@ -396,21 +396,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/receiver/httpcheckreceiver/factory.go b/receiver/httpcheckreceiver/factory.go index 078dbe8d7e65..c49de5f41593 100644 --- a/receiver/httpcheckreceiver/factory.go +++ b/receiver/httpcheckreceiver/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -58,7 +58,7 @@ func createDefaultConfig() component.ReceiverConfig { } } -func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf component.ReceiverConfig, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf component.Config, consumer consumer.Metrics) (component.MetricsReceiver, error) { cfg, ok := rConf.(*Config) if !ok { return nil, errConfigNotHTTPCheck diff --git a/receiver/httpcheckreceiver/factory_test.go b/receiver/httpcheckreceiver/factory_test.go index 3e588dca0180..319d9ead0056 100644 --- a/receiver/httpcheckreceiver/factory_test.go +++ b/receiver/httpcheckreceiver/factory_test.go @@ -47,7 +47,7 @@ func TestNewFactory(t *testing.T) { testFunc: func(t *testing.T) { factory := NewFactory() - var expectedCfg component.ReceiverConfig = &Config{ + var expectedCfg component.Config = &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, diff --git a/receiver/httpcheckreceiver/go.mod b/receiver/httpcheckreceiver/go.mod index 0f4cc755bd2e..42f502b85643 100644 --- a/receiver/httpcheckreceiver/go.mod +++ b/receiver/httpcheckreceiver/go.mod @@ -5,10 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 ) @@ -33,7 +33,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/httpcheckreceiver/go.sum b/receiver/httpcheckreceiver/go.sum index 846520af9c0e..d3bc0f40c5b2 100644 --- a/receiver/httpcheckreceiver/go.sum +++ b/receiver/httpcheckreceiver/go.sum @@ -292,16 +292,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/iisreceiver/factory.go b/receiver/iisreceiver/factory.go index 7a4c71fafaa4..93c9913c04da 100644 --- a/receiver/iisreceiver/factory.go +++ b/receiver/iisreceiver/factory.go @@ -37,7 +37,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), diff --git a/receiver/iisreceiver/factory_others.go b/receiver/iisreceiver/factory_others.go index 593eebb77236..9a54a6813a57 100644 --- a/receiver/iisreceiver/factory_others.go +++ b/receiver/iisreceiver/factory_others.go @@ -29,7 +29,7 @@ import ( func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { return nil, errors.New("the windows perf counters receiver is only supported on Windows") diff --git a/receiver/iisreceiver/factory_test.go b/receiver/iisreceiver/factory_test.go index d9e78dc48437..c58a99dc2d85 100644 --- a/receiver/iisreceiver/factory_test.go +++ b/receiver/iisreceiver/factory_test.go @@ -35,7 +35,7 @@ func TestNewFactory(t *testing.T) { t.Run("NewFactoryDefaultConfig", func(t *testing.T) { factory := NewFactory() - var expectedCfg component.ReceiverConfig = &Config{ + var expectedCfg component.Config = &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 60 * time.Second, diff --git a/receiver/iisreceiver/factory_windows.go b/receiver/iisreceiver/factory_windows.go index c0ac078f81fb..764e14b27191 100644 --- a/receiver/iisreceiver/factory_windows.go +++ b/receiver/iisreceiver/factory_windows.go @@ -28,7 +28,7 @@ import ( func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf component.ReceiverConfig, + rConf component.Config, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) diff --git a/receiver/iisreceiver/go.mod b/receiver/iisreceiver/go.mod index 9d4093b82376..15a3faf1d112 100644 --- a/receiver/iisreceiver/go.mod +++ b/receiver/iisreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -28,7 +28,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/iisreceiver/go.sum b/receiver/iisreceiver/go.sum index fb5a14475af6..4c6656f8bfa5 100644 --- a/receiver/iisreceiver/go.sum +++ b/receiver/iisreceiver/go.sum @@ -279,16 +279,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/influxdbreceiver/factory.go b/receiver/influxdbreceiver/factory.go index a5497979c4be..bb8a5fc6f2bf 100644 --- a/receiver/influxdbreceiver/factory.go +++ b/receiver/influxdbreceiver/factory.go @@ -36,7 +36,7 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig creates the default configuration for receiver. -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ @@ -45,6 +45,6 @@ func createDefaultConfig() component.ReceiverConfig { } } -func createMetricsReceiver(_ context.Context, params component.ReceiverCreateSettings, cfg component.ReceiverConfig, nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(_ context.Context, params component.ReceiverCreateSettings, cfg component.Config, nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { return newMetricsReceiver(cfg.(*Config), params.TelemetrySettings, nextConsumer) } diff --git a/receiver/influxdbreceiver/go.mod b/receiver/influxdbreceiver/go.mod index 5275bc06f8bd..6b343048701b 100644 --- a/receiver/influxdbreceiver/go.mod +++ b/receiver/influxdbreceiver/go.mod @@ -7,9 +7,9 @@ require ( github.com/influxdata/influxdb-observability/influx2otel v0.2.32 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -32,8 +32,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/influxdbreceiver/go.sum b/receiver/influxdbreceiver/go.sum index 1472475b4640..55d8307f8a8f 100644 --- a/receiver/influxdbreceiver/go.sum +++ b/receiver/influxdbreceiver/go.sum @@ -291,16 +291,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/jaegerreceiver/config.go b/receiver/jaegerreceiver/config.go index f650dd5121bd..bf63618c872b 100644 --- a/receiver/jaegerreceiver/config.go +++ b/receiver/jaegerreceiver/config.go @@ -85,7 +85,7 @@ type Config struct { RemoteSampling *RemoteSamplingConfig `mapstructure:"remote_sampling"` } -var _ component.ReceiverConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) var _ confmap.Unmarshaler = (*Config)(nil) // Validate checks the receiver configuration is valid diff --git a/receiver/jaegerreceiver/config_test.go b/receiver/jaegerreceiver/config_test.go index ebef2dcbda68..a7de8158cef3 100644 --- a/receiver/jaegerreceiver/config_test.go +++ b/receiver/jaegerreceiver/config_test.go @@ -38,7 +38,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, "customname"), @@ -158,7 +158,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) @@ -174,17 +174,17 @@ func TestFailedLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "typo_default_proto_config").String()) require.NoError(t, err) - err = component.UnmarshalReceiverConfig(sub, cfg) + err = component.UnmarshalConfig(sub, cfg) assert.EqualError(t, err, "1 error(s) decoding:\n\n* 'protocols' has invalid keys: thrift_htttp") sub, err = cm.Sub(component.NewIDWithName(typeStr, "bad_proto_config").String()) require.NoError(t, err) - err = component.UnmarshalReceiverConfig(sub, cfg) + err = component.UnmarshalConfig(sub, cfg) assert.EqualError(t, err, "1 error(s) decoding:\n\n* 'protocols' has invalid keys: thrift_htttp") sub, err = cm.Sub(component.NewIDWithName(typeStr, "empty").String()) require.NoError(t, err) - err = component.UnmarshalReceiverConfig(sub, cfg) + err = component.UnmarshalConfig(sub, cfg) assert.EqualError(t, err, "empty config for Jaeger receiver") } diff --git a/receiver/jaegerreceiver/factory.go b/receiver/jaegerreceiver/factory.go index 579f144c7979..d44fd30b270c 100644 --- a/receiver/jaegerreceiver/factory.go +++ b/receiver/jaegerreceiver/factory.go @@ -53,7 +53,7 @@ func NewFactory() component.ReceiverFactory { } // CreateDefaultConfig creates the default configuration for Jaeger receiver. -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Protocols: Protocols{ @@ -82,7 +82,7 @@ func createDefaultConfig() component.ReceiverConfig { func createTracesReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { diff --git a/receiver/jaegerreceiver/factory_test.go b/receiver/jaegerreceiver/factory_test.go index ebf464cb201e..e43d4f0e5d7d 100644 --- a/receiver/jaegerreceiver/factory_test.go +++ b/receiver/jaegerreceiver/factory_test.go @@ -71,7 +71,7 @@ func TestCreateReceiverGeneralConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "customname").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) set := componenttest.NewNopReceiverCreateSettings() tReceiver, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index d16f0eac495a..8fce28a31256 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -9,11 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.51.0 ) @@ -44,7 +44,7 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/receiver/jaegerreceiver/go.sum b/receiver/jaegerreceiver/go.sum index 8c74fa0a35f8..95a47868f56a 100644 --- a/receiver/jaegerreceiver/go.sum +++ b/receiver/jaegerreceiver/go.sum @@ -330,18 +330,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= diff --git a/receiver/jmxreceiver/config_test.go b/receiver/jmxreceiver/config_test.go index f861392a2c37..87e4302f2789 100644 --- a/receiver/jmxreceiver/config_test.go +++ b/receiver/jmxreceiver/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { initSupportedJars() tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config expectedErr string }{ { @@ -229,7 +229,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expectedErr != "" { assert.ErrorContains(t, cfg.(*Config).validate(), tt.expectedErr) @@ -255,7 +255,7 @@ func TestCustomMetricsGathererConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "invalidtargetsystem").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) conf := cfg.(*Config) diff --git a/receiver/jmxreceiver/factory.go b/receiver/jmxreceiver/factory.go index 9cdbeccd8254..7ba30677594a 100644 --- a/receiver/jmxreceiver/factory.go +++ b/receiver/jmxreceiver/factory.go @@ -37,7 +37,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), JARPath: "/opt/opentelemetry-java-contrib-jmx-metrics.jar", @@ -54,7 +54,7 @@ func createDefaultConfig() component.ReceiverConfig { func createReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { jmxConfig := cfg.(*Config) diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index cba2d561b46e..bf26a7cc00b9 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 ) @@ -66,7 +66,7 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/receiver/jmxreceiver/go.sum b/receiver/jmxreceiver/go.sum index 10e4c1e213dc..4bb794e1bd82 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -853,18 +853,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0 h1:ZHEOeGOIYIDTKhI9xs30/obFfhUbb9b2+e/eahp1fJA= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 h1:/+HfaoVPSXgHUZOTZSSriuKOQi8L/rgyb7TTRx5jzoo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= go.opentelemetry.io/collector/semconv v0.65.0 h1:y3eB42UD+Ie/918wuZD6VdqNgMD05gjAI7SVkWKrA38= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= diff --git a/receiver/journaldreceiver/go.mod b/receiver/journaldreceiver/go.mod index cacddceb5c98..45bf2dacc4e0 100644 --- a/receiver/journaldreceiver/go.mod +++ b/receiver/journaldreceiver/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -29,8 +29,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum index aab445409328..bc5848452b04 100644 --- a/receiver/journaldreceiver/go.sum +++ b/receiver/journaldreceiver/go.sum @@ -305,16 +305,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/journaldreceiver/journald.go b/receiver/journaldreceiver/journald.go index ea97ad8c1087..fba2c2777db5 100644 --- a/receiver/journaldreceiver/journald.go +++ b/receiver/journaldreceiver/journald.go @@ -46,7 +46,7 @@ func (f ReceiverType) Type() component.Type { } // CreateDefaultConfig creates a config with type and version -func (f ReceiverType) CreateDefaultConfig() component.ReceiverConfig { +func (f ReceiverType) CreateDefaultConfig() component.Config { return &JournaldConfig{ BaseConfig: adapter.BaseConfig{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -57,7 +57,7 @@ func (f ReceiverType) CreateDefaultConfig() component.ReceiverConfig { } // BaseConfig gets the base config from config, for now -func (f ReceiverType) BaseConfig(cfg component.ReceiverConfig) adapter.BaseConfig { +func (f ReceiverType) BaseConfig(cfg component.Config) adapter.BaseConfig { return cfg.(*JournaldConfig).BaseConfig } @@ -68,6 +68,6 @@ type JournaldConfig struct { } // InputConfig unmarshals the input operator -func (f ReceiverType) InputConfig(cfg component.ReceiverConfig) operator.Config { +func (f ReceiverType) InputConfig(cfg component.Config) operator.Config { return operator.NewConfig(&cfg.(*JournaldConfig).InputConfig) } diff --git a/receiver/journaldreceiver/journald_nonlinux.go b/receiver/journaldreceiver/journald_nonlinux.go index 563d996b8d9c..dbb370cfffb1 100644 --- a/receiver/journaldreceiver/journald_nonlinux.go +++ b/receiver/journaldreceiver/journald_nonlinux.go @@ -46,7 +46,7 @@ type JournaldConfig struct { adapter.BaseConfig `mapstructure:",squash"` } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &JournaldConfig{ BaseConfig: adapter.BaseConfig{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -58,7 +58,7 @@ func createDefaultConfig() component.ReceiverConfig { func createLogsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Logs, ) (component.LogsReceiver, error) { return nil, fmt.Errorf("journald is only supported on linux") diff --git a/receiver/journaldreceiver/journald_test.go b/receiver/journaldreceiver/journald_test.go index b2233bdc9824..36da727cebfe 100644 --- a/receiver/journaldreceiver/journald_test.go +++ b/receiver/journaldreceiver/journald_test.go @@ -43,7 +43,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, testdataConfigYaml(), cfg) } diff --git a/receiver/k8sclusterreceiver/config.go b/receiver/k8sclusterreceiver/config.go index 881c92c99f99..374a2b82ceb0 100644 --- a/receiver/k8sclusterreceiver/config.go +++ b/receiver/k8sclusterreceiver/config.go @@ -51,5 +51,5 @@ func (cfg *Config) Validate() error { default: return fmt.Errorf("\"%s\" is not a supported distribution. Must be one of: \"openshift\", \"kubernetes\"", cfg.Distribution) } - return cfg.APIConfig.Validate() + return nil } diff --git a/receiver/k8sclusterreceiver/config_test.go b/receiver/k8sclusterreceiver/config_test.go index 50db5d7678be..4ef22d1d6ece 100644 --- a/receiver/k8sclusterreceiver/config_test.go +++ b/receiver/k8sclusterreceiver/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config expectedErr error }{ { @@ -78,7 +78,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) @@ -100,6 +100,7 @@ func TestInvalidConfig(t *testing.T) { // Wrong distro cfg = &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewIDWithName(typeStr, "all_settings")), + APIConfig: k8sconfig.APIConfig{AuthType: k8sconfig.AuthTypeNone}, Distribution: "wrong", CollectionInterval: 30 * time.Second, } diff --git a/receiver/k8sclusterreceiver/factory.go b/receiver/k8sclusterreceiver/factory.go index fb253a61c92d..f02920e408d2 100644 --- a/receiver/k8sclusterreceiver/factory.go +++ b/receiver/k8sclusterreceiver/factory.go @@ -40,7 +40,7 @@ const ( var defaultNodeConditionsToReport = []string{"Ready"} -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Distribution: defaultDistribution, diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 80364082a398..9759bb5b0088 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -12,11 +12,11 @@ require ( github.com/openshift/api v0.0.0-20210521075222-e273a339932a github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 @@ -70,7 +70,7 @@ require ( github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index 6e90d24a0637..9e81b4f09a54 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -469,18 +469,18 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/k8sclusterreceiver/receiver.go b/receiver/k8sclusterreceiver/receiver.go index 0603013487bb..102691b8ea0b 100644 --- a/receiver/k8sclusterreceiver/receiver.go +++ b/receiver/k8sclusterreceiver/receiver.go @@ -114,7 +114,7 @@ func (kr *kubernetesReceiver) dispatchMetrics(ctx context.Context) { } // newReceiver creates the Kubernetes cluster receiver with the given configuration. -func newReceiver(_ context.Context, set component.ReceiverCreateSettings, cfg component.ReceiverConfig, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func newReceiver(_ context.Context, set component.ReceiverCreateSettings, cfg component.Config, consumer consumer.Metrics) (component.MetricsReceiver, error) { rCfg := cfg.(*Config) obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ diff --git a/receiver/k8seventsreceiver/config_test.go b/receiver/k8seventsreceiver/config_test.go index e262fe5762cb..49aed5b729da 100644 --- a/receiver/k8seventsreceiver/config_test.go +++ b/receiver/k8seventsreceiver/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config expectedErr error }{ { @@ -61,7 +61,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/k8seventsreceiver/factory.go b/receiver/k8seventsreceiver/factory.go index 0c87a0f07d61..92c626690e9a 100644 --- a/receiver/k8seventsreceiver/factory.go +++ b/receiver/k8seventsreceiver/factory.go @@ -39,7 +39,7 @@ func NewFactory() component.ReceiverFactory { component.WithLogsReceiver(createLogsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), APIConfig: k8sconfig.APIConfig{ @@ -51,7 +51,7 @@ func createDefaultConfig() component.ReceiverConfig { func createLogsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Logs, ) (component.LogsReceiver, error) { rCfg := cfg.(*Config) diff --git a/receiver/k8seventsreceiver/go.mod b/receiver/k8seventsreceiver/go.mod index 6ec228b5d444..b6b8cc3a96d1 100644 --- a/receiver/k8seventsreceiver/go.mod +++ b/receiver/k8seventsreceiver/go.mod @@ -5,11 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 @@ -51,7 +51,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/k8seventsreceiver/go.sum b/receiver/k8seventsreceiver/go.sum index 57769baeacdb..24ab7d95368f 100644 --- a/receiver/k8seventsreceiver/go.sum +++ b/receiver/k8seventsreceiver/go.sum @@ -450,18 +450,18 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/k8sobjectsreceiver/config_test.go b/receiver/k8sobjectsreceiver/config_test.go index 55870e0edbf6..17faf6dff367 100644 --- a/receiver/k8sobjectsreceiver/config_test.go +++ b/receiver/k8sobjectsreceiver/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub("k8sobjects") require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) require.NotNil(t, cfg) err = component.ValidateConfig(cfg) @@ -88,7 +88,7 @@ func TestValidConfigs(t *testing.T) { sub, err := cm.Sub("k8sobjects/invalid_resource") require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) cfg.makeDiscoveryClient = getMockDiscoveryClient diff --git a/receiver/k8sobjectsreceiver/factory.go b/receiver/k8sobjectsreceiver/factory.go index b8f4edbcfb96..b07101c3d16d 100644 --- a/receiver/k8sobjectsreceiver/factory.go +++ b/receiver/k8sobjectsreceiver/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ReceiverFactory { ) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), APIConfig: k8sconfig.APIConfig{ @@ -52,7 +52,7 @@ func createDefaultConfig() component.ReceiverConfig { func createLogsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Logs, ) (component.LogsReceiver, error) { rcfg := cfg.(*Config) diff --git a/receiver/k8sobjectsreceiver/go.mod b/receiver/k8sobjectsreceiver/go.mod index a4dbf151c8b4..8d82bf78932e 100644 --- a/receiver/k8sobjectsreceiver/go.mod +++ b/receiver/k8sobjectsreceiver/go.mod @@ -5,11 +5,11 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 k8s.io/apimachinery v0.25.4 k8s.io/client-go v0.25.4 @@ -46,7 +46,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/k8sobjectsreceiver/go.sum b/receiver/k8sobjectsreceiver/go.sum index 814ed654d804..567c7f3ad0a3 100644 --- a/receiver/k8sobjectsreceiver/go.sum +++ b/receiver/k8sobjectsreceiver/go.sum @@ -442,18 +442,18 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/kafkametricsreceiver/config_test.go b/receiver/kafkametricsreceiver/config_test.go index 8e7d3c7b555f..ffab0a997a7f 100644 --- a/receiver/kafkametricsreceiver/config_test.go +++ b/receiver/kafkametricsreceiver/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, &Config{ ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(typeStr), diff --git a/receiver/kafkametricsreceiver/factory.go b/receiver/kafkametricsreceiver/factory.go index 603ede8682ab..9685188083de 100644 --- a/receiver/kafkametricsreceiver/factory.go +++ b/receiver/kafkametricsreceiver/factory.go @@ -41,7 +41,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(typeStr), Brokers: []string{defaultBroker}, @@ -55,7 +55,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { c := cfg.(*Config) r, err := newMetricsReceiver(ctx, *c, params, nextConsumer) diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index a805dbea16e3..d1c96551f2ae 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -7,10 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -78,8 +78,8 @@ require ( github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/kafkametricsreceiver/go.sum b/receiver/kafkametricsreceiver/go.sum index f1540132ae98..0de259ffc507 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -874,18 +874,18 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/kafkareceiver/config.go b/receiver/kafkareceiver/config.go index aaae45f0d17d..a29fd4186687 100644 --- a/receiver/kafkareceiver/config.go +++ b/receiver/kafkareceiver/config.go @@ -72,7 +72,7 @@ type Config struct { MessageMarking MessageMarking `mapstructure:"message_marking"` } -var _ component.ReceiverConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks the receiver configuration is valid func (cfg *Config) Validate() error { diff --git a/receiver/kafkareceiver/config_test.go b/receiver/kafkareceiver/config_test.go index 66671e1f1f75..64d0ac883085 100644 --- a/receiver/kafkareceiver/config_test.go +++ b/receiver/kafkareceiver/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config expectedErr error }{ { @@ -112,7 +112,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/kafkareceiver/factory.go b/receiver/kafkareceiver/factory.go index e2a11189638a..366934bea16c 100644 --- a/receiver/kafkareceiver/factory.go +++ b/receiver/kafkareceiver/factory.go @@ -100,7 +100,7 @@ func NewFactory(options ...FactoryOption) component.ReceiverFactory { ) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Topic: defaultTopic, @@ -135,7 +135,7 @@ type kafkaReceiverFactory struct { func (f *kafkaReceiverFactory) createTracesReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { c := cfg.(*Config) @@ -149,7 +149,7 @@ func (f *kafkaReceiverFactory) createTracesReceiver( func (f *kafkaReceiverFactory) createMetricsReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { c := cfg.(*Config) @@ -163,7 +163,7 @@ func (f *kafkaReceiverFactory) createMetricsReceiver( func (f *kafkaReceiverFactory) createLogsReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Logs, ) (component.LogsReceiver, error) { c := cfg.(*Config) diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index e63f8e744b0f..b194dd4d0542 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -14,11 +14,11 @@ require ( github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -57,7 +57,7 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index 1ff4fe315883..a2aef9da3fbd 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -337,18 +337,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/kubeletstatsreceiver/config.go b/receiver/kubeletstatsreceiver/config.go index abbb566ee660..72e1440442db 100644 --- a/receiver/kubeletstatsreceiver/config.go +++ b/receiver/kubeletstatsreceiver/config.go @@ -30,7 +30,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver/internal/metadata" ) -var _ component.ReceiverConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` @@ -55,15 +55,6 @@ type Config struct { Metrics metadata.MetricsSettings `mapstructure:"metrics"` } -func (cfg *Config) Validate() error { - if cfg.K8sAPIConfig != nil { - if err := cfg.K8sAPIConfig.Validate(); err != nil { - return err - } - } - return nil -} - // getReceiverOptions returns scraperOptions is the config is valid, // otherwise it will return an error. func (cfg *Config) getReceiverOptions() (*scraperOptions, error) { diff --git a/receiver/kubeletstatsreceiver/config_test.go b/receiver/kubeletstatsreceiver/config_test.go index 7b43f3351103..e4569b73f47a 100644 --- a/receiver/kubeletstatsreceiver/config_test.go +++ b/receiver/kubeletstatsreceiver/config_test.go @@ -45,7 +45,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config expectedErr error }{ { @@ -195,7 +195,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/kubeletstatsreceiver/factory.go b/receiver/kubeletstatsreceiver/factory.go index accfea2dbee9..c23e7f0d79f1 100644 --- a/receiver/kubeletstatsreceiver/factory.go +++ b/receiver/kubeletstatsreceiver/factory.go @@ -49,7 +49,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { scs := scraperhelper.NewDefaultScraperControllerSettings(typeStr) scs.CollectionInterval = 10 * time.Second @@ -67,7 +67,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( ctx context.Context, set component.ReceiverCreateSettings, - baseCfg component.ReceiverConfig, + baseCfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := baseCfg.(*Config) diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 8aab6129649f..1bb5c8992cb1 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 k8s.io/api v0.25.4 k8s.io/apimachinery v0.25.4 @@ -52,7 +52,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index 430a82d6c923..b7ce8d79fbe6 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -444,18 +444,18 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/memcachedreceiver/config_test.go b/receiver/memcachedreceiver/config_test.go index b7607f7f27fb..8e1556e2e059 100644 --- a/receiver/memcachedreceiver/config_test.go +++ b/receiver/memcachedreceiver/config_test.go @@ -38,7 +38,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) require.Equal(t, factory.CreateDefaultConfig(), cfg) } diff --git a/receiver/memcachedreceiver/factory.go b/receiver/memcachedreceiver/factory.go index 8090c7154030..a80fba4b86af 100644 --- a/receiver/memcachedreceiver/factory.go +++ b/receiver/memcachedreceiver/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -60,7 +60,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf component.ReceiverConfig, + rConf component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index 4241e5db66a1..7149a152c999 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -7,10 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -52,7 +52,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/memcachedreceiver/go.sum b/receiver/memcachedreceiver/go.sum index a9690fad1b28..75e91eda75a1 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -823,16 +823,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/mongodbatlasreceiver/config.go b/receiver/mongodbatlasreceiver/config.go index 385574c1e2f2..eaf85ecd6236 100644 --- a/receiver/mongodbatlasreceiver/config.go +++ b/receiver/mongodbatlasreceiver/config.go @@ -30,7 +30,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal/metadata" ) -var _ component.ReceiverConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` diff --git a/receiver/mongodbatlasreceiver/factory.go b/receiver/mongodbatlasreceiver/factory.go index 41d1dc96623d..46a1a290ceb0 100644 --- a/receiver/mongodbatlasreceiver/factory.go +++ b/receiver/mongodbatlasreceiver/factory.go @@ -48,7 +48,7 @@ func NewFactory() component.ReceiverFactory { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf component.ReceiverConfig, + rConf component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) @@ -64,7 +64,7 @@ func createMetricsReceiver( func createCombinedLogReceiver( ctx context.Context, params component.ReceiverCreateSettings, - rConf component.ReceiverConfig, + rConf component.Config, consumer consumer.Logs, ) (component.LogsReceiver, error) { cfg := rConf.(*Config) @@ -90,7 +90,7 @@ func createCombinedLogReceiver( return recv, nil } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(typeStr), Granularity: defaultGranularity, diff --git a/receiver/mongodbatlasreceiver/go.mod b/receiver/mongodbatlasreceiver/go.mod index 25e0eb889902..80cdec16ffd4 100644 --- a/receiver/mongodbatlasreceiver/go.mod +++ b/receiver/mongodbatlasreceiver/go.mod @@ -9,10 +9,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 go.mongodb.org/atlas v0.19.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -39,7 +39,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index dd2fa86dce04..0fa05584b8d0 100644 --- a/receiver/mongodbatlasreceiver/go.sum +++ b/receiver/mongodbatlasreceiver/go.sum @@ -315,16 +315,16 @@ go.mongodb.org/atlas v0.19.0 h1:gvezG9d0KsSDaExEdTtcGqZHRvvVazzuEcBUpBXxmlg= go.mongodb.org/atlas v0.19.0/go.mod h1:PFk1IGhiGjFXHGVspOK7i1U2nnPjK8wAjYwQf6FoVf4= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/mongodbreceiver/config_test.go b/receiver/mongodbreceiver/config_test.go index c8dee7fb69ed..5b1b64ead107 100644 --- a/receiver/mongodbreceiver/config_test.go +++ b/receiver/mongodbreceiver/config_test.go @@ -209,7 +209,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Hosts = []confignet.NetAddr{ diff --git a/receiver/mongodbreceiver/factory.go b/receiver/mongodbreceiver/factory.go index 5480705ceb19..e9c12f83e41b 100644 --- a/receiver/mongodbreceiver/factory.go +++ b/receiver/mongodbreceiver/factory.go @@ -41,7 +41,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -61,7 +61,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf component.ReceiverConfig, + rConf component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) diff --git a/receiver/mongodbreceiver/go.mod b/receiver/mongodbreceiver/go.mod index 4c5421ac1d2a..7c527debe338 100644 --- a/receiver/mongodbreceiver/go.mod +++ b/receiver/mongodbreceiver/go.mod @@ -8,10 +8,10 @@ require ( github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.mongodb.org/mongo-driver v1.10.3 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -61,7 +61,7 @@ require ( github.com/xdg-go/stringprep v1.0.3 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/mongodbreceiver/go.sum b/receiver/mongodbreceiver/go.sum index c7aaa3110d27..8c8d56211eab 100644 --- a/receiver/mongodbreceiver/go.sum +++ b/receiver/mongodbreceiver/go.sum @@ -840,16 +840,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/mysqlreceiver/config_test.go b/receiver/mysqlreceiver/config_test.go index 67782cf99a45..0e0937731228 100644 --- a/receiver/mysqlreceiver/config_test.go +++ b/receiver/mysqlreceiver/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "localhost:3306" diff --git a/receiver/mysqlreceiver/factory.go b/receiver/mysqlreceiver/factory.go index 580e9c2bf519..356f41d6d345 100644 --- a/receiver/mysqlreceiver/factory.go +++ b/receiver/mysqlreceiver/factory.go @@ -39,7 +39,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -63,7 +63,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf component.ReceiverConfig, + rConf component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index a533098ceb80..bc67010dedb0 100644 --- a/receiver/mysqlreceiver/go.mod +++ b/receiver/mysqlreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/featuregate v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) diff --git a/receiver/mysqlreceiver/go.sum b/receiver/mysqlreceiver/go.sum index 736f130f26c0..9d5d43706b70 100644 --- a/receiver/mysqlreceiver/go.sum +++ b/receiver/mysqlreceiver/go.sum @@ -818,16 +818,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/nginxreceiver/config_test.go b/receiver/nginxreceiver/config_test.go index 3724a8396e31..765688812bce 100644 --- a/receiver/nginxreceiver/config_test.go +++ b/receiver/nginxreceiver/config_test.go @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, factory.CreateDefaultConfig(), cfg) } diff --git a/receiver/nginxreceiver/factory.go b/receiver/nginxreceiver/factory.go index e10c74d0e02c..ffe2528c449c 100644 --- a/receiver/nginxreceiver/factory.go +++ b/receiver/nginxreceiver/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -57,7 +57,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf component.ReceiverConfig, + rConf component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 078f4e65bdff..64d256d26d2d 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -7,10 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -56,7 +56,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index 2c80cb0c16bf..87f08d6c0a46 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -835,16 +835,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/nsxtreceiver/config_test.go b/receiver/nsxtreceiver/config_test.go index 2beddd248aff..90aed04b43df 100644 --- a/receiver/nsxtreceiver/config_test.go +++ b/receiver/nsxtreceiver/config_test.go @@ -98,7 +98,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "https://nsx-manager-endpoint" diff --git a/receiver/nsxtreceiver/factory.go b/receiver/nsxtreceiver/factory.go index bd4a40164a93..e8b84fbed581 100644 --- a/receiver/nsxtreceiver/factory.go +++ b/receiver/nsxtreceiver/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ReceiverFactory { ) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -53,7 +53,7 @@ func createDefaultConfig() component.ReceiverConfig { } } -func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf component.ReceiverConfig, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf component.Config, consumer consumer.Metrics) (component.MetricsReceiver, error) { cfg, ok := rConf.(*Config) if !ok { return nil, errConfigNotNSX diff --git a/receiver/nsxtreceiver/go.mod b/receiver/nsxtreceiver/go.mod index 866d05b7d2a0..0ed689a77d21 100644 --- a/receiver/nsxtreceiver/go.mod +++ b/receiver/nsxtreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -35,7 +35,7 @@ require ( github.com/rs/cors v1.8.2 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/nsxtreceiver/go.sum b/receiver/nsxtreceiver/go.sum index dfae170bdf26..d271bea25d32 100644 --- a/receiver/nsxtreceiver/go.sum +++ b/receiver/nsxtreceiver/go.sum @@ -293,16 +293,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/opencensusreceiver/config.go b/receiver/opencensusreceiver/config.go index d0632a1a691d..cfee6accdb91 100644 --- a/receiver/opencensusreceiver/config.go +++ b/receiver/opencensusreceiver/config.go @@ -44,7 +44,7 @@ func (cfg *Config) buildOptions() []ocOption { return opts } -var _ component.ReceiverConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks the receiver configuration is valid func (cfg *Config) Validate() error { diff --git a/receiver/opencensusreceiver/config_test.go b/receiver/opencensusreceiver/config_test.go index 30f352d4580a..4c17dec558b9 100644 --- a/receiver/opencensusreceiver/config_test.go +++ b/receiver/opencensusreceiver/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, "customname"), @@ -154,7 +154,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/opencensusreceiver/factory.go b/receiver/opencensusreceiver/factory.go index e66289b52a9c..5bf5ace4fb6d 100644 --- a/receiver/opencensusreceiver/factory.go +++ b/receiver/opencensusreceiver/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), GRPCServerSettings: configgrpc.GRPCServerSettings{ @@ -57,7 +57,7 @@ func createDefaultConfig() component.ReceiverConfig { func createTracesReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { var err error @@ -78,7 +78,7 @@ func createTracesReceiver( func createMetricsReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { var err error diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index 6419c1124089..bae2cead970a 100644 --- a/receiver/opencensusreceiver/go.mod +++ b/receiver/opencensusreceiver/go.mod @@ -12,10 +12,10 @@ require ( github.com/rs/cors v1.8.2 github.com/soheilhy/cmux v0.1.5 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 go.opentelemetry.io/otel v1.11.1 go.opentelemetry.io/otel/sdk v1.11.1 @@ -55,8 +55,8 @@ require ( github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.33.0 // indirect diff --git a/receiver/opencensusreceiver/go.sum b/receiver/opencensusreceiver/go.sum index cb2aa30d0756..b17b4dfd9213 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -400,18 +400,18 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/oracledbreceiver/factory.go b/receiver/oracledbreceiver/factory.go index 8dd910b564e1..47966c596514 100644 --- a/receiver/oracledbreceiver/factory.go +++ b/receiver/oracledbreceiver/factory.go @@ -35,10 +35,10 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createMetricsReceiver(ctx context.Context, settings component.ReceiverCreateSettings, receiver component.ReceiverConfig, metrics consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(ctx context.Context, settings component.ReceiverCreateSettings, receiver component.Config, metrics consumer.Metrics) (component.MetricsReceiver, error) { return &oracledbreceiver{}, nil } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr))} } diff --git a/receiver/oracledbreceiver/go.mod b/receiver/oracledbreceiver/go.mod index 6ff000de782b..d3bad2c1ecdf 100644 --- a/receiver/oracledbreceiver/go.mod +++ b/receiver/oracledbreceiver/go.mod @@ -4,10 +4,10 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -22,7 +22,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/oracledbreceiver/go.sum b/receiver/oracledbreceiver/go.sum index a75ae5a5ff53..bb7d1973a697 100644 --- a/receiver/oracledbreceiver/go.sum +++ b/receiver/oracledbreceiver/go.sum @@ -257,16 +257,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/otlpjsonfilereceiver/file.go b/receiver/otlpjsonfilereceiver/file.go index e2c8e0d60e6f..21a493921635 100644 --- a/receiver/otlpjsonfilereceiver/file.go +++ b/receiver/otlpjsonfilereceiver/file.go @@ -51,7 +51,7 @@ type Config struct { StorageID *component.ID `mapstructure:"storage"` } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ Config: *fileconsumer.NewConfig(), ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -76,7 +76,7 @@ func (f *receiver) Shutdown(ctx context.Context) error { return f.input.Stop() } -func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSettings, configuration component.ReceiverConfig, logs consumer.Logs) (component.LogsReceiver, error) { +func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSettings, configuration component.Config, logs consumer.Logs) (component.LogsReceiver, error) { logsUnmarshaler := &plog.JSONUnmarshaler{} obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ ReceiverID: configuration.ID(), @@ -105,7 +105,7 @@ func createLogsReceiver(_ context.Context, settings component.ReceiverCreateSett return &receiver{input: input, id: cfg.ID(), storageID: cfg.StorageID}, nil } -func createMetricsReceiver(_ context.Context, settings component.ReceiverCreateSettings, configuration component.ReceiverConfig, metrics consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(_ context.Context, settings component.ReceiverCreateSettings, configuration component.Config, metrics consumer.Metrics) (component.MetricsReceiver, error) { metricsUnmarshaler := &pmetric.JSONUnmarshaler{} obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ ReceiverID: configuration.ID(), @@ -134,7 +134,7 @@ func createMetricsReceiver(_ context.Context, settings component.ReceiverCreateS return &receiver{input: input, id: cfg.ID(), storageID: cfg.StorageID}, nil } -func createTracesReceiver(ctx context.Context, settings component.ReceiverCreateSettings, configuration component.ReceiverConfig, traces consumer.Traces) (component.TracesReceiver, error) { +func createTracesReceiver(ctx context.Context, settings component.ReceiverCreateSettings, configuration component.Config, traces consumer.Traces) (component.TracesReceiver, error) { tracesUnmarshaler := &ptrace.JSONUnmarshaler{} obsrecv, err := obsreport.NewReceiver(obsreport.ReceiverSettings{ ReceiverID: configuration.ID(), diff --git a/receiver/otlpjsonfilereceiver/file_test.go b/receiver/otlpjsonfilereceiver/file_test.go index ec1a26a52eb8..48420ef1c207 100644 --- a/receiver/otlpjsonfilereceiver/file_test.go +++ b/receiver/otlpjsonfilereceiver/file_test.go @@ -152,7 +152,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, testdataConfigYamlAsMap(), cfg) } diff --git a/receiver/otlpjsonfilereceiver/go.mod b/receiver/otlpjsonfilereceiver/go.mod index b5bce8f33a18..8d6e1e19342a 100644 --- a/receiver/otlpjsonfilereceiver/go.mod +++ b/receiver/otlpjsonfilereceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -29,7 +29,7 @@ require ( github.com/observiq/ctimefmt v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/otlpjsonfilereceiver/go.sum b/receiver/otlpjsonfilereceiver/go.sum index 5586451c6e3f..0a5f3e242c59 100644 --- a/receiver/otlpjsonfilereceiver/go.sum +++ b/receiver/otlpjsonfilereceiver/go.sum @@ -294,16 +294,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/podmanreceiver/config.go b/receiver/podmanreceiver/config.go index a1b8fee09a13..642ca5c7fd1f 100644 --- a/receiver/podmanreceiver/config.go +++ b/receiver/podmanreceiver/config.go @@ -22,7 +22,7 @@ import ( "go.opentelemetry.io/collector/receiver/scraperhelper" ) -var _ component.ReceiverConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` diff --git a/receiver/podmanreceiver/config_test.go b/receiver/podmanreceiver/config_test.go index 422ea7c1538e..1df4c9ca9adb 100644 --- a/receiver/podmanreceiver/config_test.go +++ b/receiver/podmanreceiver/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config expectedErr error }{ { @@ -71,7 +71,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/podmanreceiver/factory.go b/receiver/podmanreceiver/factory.go index de7ccfa54541..4d2f7b4bcf48 100644 --- a/receiver/podmanreceiver/factory.go +++ b/receiver/podmanreceiver/factory.go @@ -49,14 +49,14 @@ func createDefaultConfig() *Config { } } -func createDefaultReceiverConfig() component.ReceiverConfig { +func createDefaultReceiverConfig() component.Config { return createDefaultConfig() } func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - config component.ReceiverConfig, + config component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { podmanConfig := config.(*Config) diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index b9ce84a5191e..11598e6280af 100644 --- a/receiver/podmanreceiver/go.mod +++ b/receiver/podmanreceiver/go.mod @@ -4,11 +4,11 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 @@ -30,7 +30,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/podmanreceiver/go.sum b/receiver/podmanreceiver/go.sum index e58d8f467a48..7e5ffad3a7aa 100644 --- a/receiver/podmanreceiver/go.sum +++ b/receiver/podmanreceiver/go.sum @@ -284,18 +284,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/postgresqlreceiver/config_test.go b/receiver/postgresqlreceiver/config_test.go index e8b217c43f0f..e34ef7762e01 100644 --- a/receiver/postgresqlreceiver/config_test.go +++ b/receiver/postgresqlreceiver/config_test.go @@ -127,7 +127,7 @@ func TestLoadConfig(t *testing.T) { t.Run("postgresql", func(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "localhost:5432" @@ -140,7 +140,7 @@ func TestLoadConfig(t *testing.T) { t.Run("postgresql/all", func(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "all").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "localhost:5432" diff --git a/receiver/postgresqlreceiver/factory.go b/receiver/postgresqlreceiver/factory.go index 4809a7fb5251..273f47077464 100644 --- a/receiver/postgresqlreceiver/factory.go +++ b/receiver/postgresqlreceiver/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -61,7 +61,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf component.ReceiverConfig, + rConf component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg := rConf.(*Config) diff --git a/receiver/postgresqlreceiver/go.mod b/receiver/postgresqlreceiver/go.mod index e95a85d5a264..cf6969dcf801 100644 --- a/receiver/postgresqlreceiver/go.mod +++ b/receiver/postgresqlreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/featuregate v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) diff --git a/receiver/postgresqlreceiver/go.sum b/receiver/postgresqlreceiver/go.sum index 144d12bc3c4c..a5ba0e5ee3a5 100644 --- a/receiver/postgresqlreceiver/go.sum +++ b/receiver/postgresqlreceiver/go.sum @@ -820,16 +820,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/prometheusexecreceiver/config_test.go b/receiver/prometheusexecreceiver/config_test.go index dc86f5081a64..b210d9b8b236 100644 --- a/receiver/prometheusexecreceiver/config_test.go +++ b/receiver/prometheusexecreceiver/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config expectedErr error }{ { @@ -107,7 +107,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/prometheusexecreceiver/factory.go b/receiver/prometheusexecreceiver/factory.go index 1484312ba612..00bedd5b88de 100644 --- a/receiver/prometheusexecreceiver/factory.go +++ b/receiver/prometheusexecreceiver/factory.go @@ -54,7 +54,7 @@ func logDeprecation(logger *zap.Logger) { } // createDefaultConfig returns a default config -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), ScrapeInterval: defaultCollectionInterval, @@ -69,7 +69,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { logDeprecation(params.Logger) diff --git a/receiver/prometheusexecreceiver/factory_test.go b/receiver/prometheusexecreceiver/factory_test.go index d8db4caae254..87392173ac4d 100644 --- a/receiver/prometheusexecreceiver/factory_test.go +++ b/receiver/prometheusexecreceiver/factory_test.go @@ -46,7 +46,7 @@ func TestCreateTraceAndMetricsReceiver(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, err) assert.NotNil(t, cfg) @@ -64,7 +64,7 @@ func TestCreateTraceAndMetricsReceiver(t *testing.T) { // Test CreateMetricsReceiver sub, err = cm.Sub(component.NewIDWithName(typeStr, "test").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) metricReceiver, err = factory.CreateMetricsReceiver(context.Background(), componenttest.NewNopReceiverCreateSettings(), cfg, nil) assert.Equal(t, nil, err) diff --git a/receiver/prometheusexecreceiver/go.mod b/receiver/prometheusexecreceiver/go.mod index 2b453bcdb8de..b09e43d0a715 100644 --- a/receiver/prometheusexecreceiver/go.mod +++ b/receiver/prometheusexecreceiver/go.mod @@ -9,10 +9,10 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -119,8 +119,8 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/prometheusexecreceiver/go.sum b/receiver/prometheusexecreceiver/go.sum index cef31a528c3a..83eb04f75941 100644 --- a/receiver/prometheusexecreceiver/go.sum +++ b/receiver/prometheusexecreceiver/go.sum @@ -618,19 +618,19 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/prometheusexecreceiver/receiver_test.go b/receiver/prometheusexecreceiver/receiver_test.go index b18ffe1c51a7..849bd45d0183 100644 --- a/receiver/prometheusexecreceiver/receiver_test.go +++ b/receiver/prometheusexecreceiver/receiver_test.go @@ -38,7 +38,7 @@ import ( ) // loadConfigAssertNoError loads the test config and asserts there are no errors, and returns the receiver wanted -func loadConfigAssertNoError(t *testing.T, receiverConfigID component.ID) component.ReceiverConfig { +func loadConfigAssertNoError(t *testing.T, receiverConfigID component.ID) component.Config { cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml")) require.NoError(t, err) factory := NewFactory() @@ -46,7 +46,7 @@ func loadConfigAssertNoError(t *testing.T, receiverConfigID component.ID) compon sub, err := cm.Sub(receiverConfigID.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) return cfg } @@ -59,7 +59,7 @@ func TestExecKeyMissing(t *testing.T) { } // assertErrorWhenExecKeyMissing makes sure the config passed throws an error, since it's missing the exec key -func assertErrorWhenExecKeyMissing(t *testing.T, errorReceiverConfig component.ReceiverConfig) { +func assertErrorWhenExecKeyMissing(t *testing.T, errorReceiverConfig component.Config) { _, err := newPromExecReceiver(componenttest.NewNopReceiverCreateSettings(), errorReceiverConfig.(*Config), nil) assert.Error(t, err, "newPromExecReceiver() didn't return an error") } @@ -74,7 +74,7 @@ func TestEndToEnd(t *testing.T) { } // endToEndScrapeTest creates a receiver that invokes `go run test_prometheus_exporter.go` and waits until it has scraped the /metrics endpoint twice - the application will crash between each scrape -func endToEndScrapeTest(t *testing.T, receiverConfig component.ReceiverConfig, testName string) { //nolint +func endToEndScrapeTest(t *testing.T, receiverConfig component.Config, testName string) { //nolint sink := new(consumertest.MetricsSink) wrapper, err := newPromExecReceiver(componenttest.NewNopReceiverCreateSettings(), receiverConfig.(*Config), sink) assert.NoError(t, err, "newPromExecReceiver() returned an error") diff --git a/receiver/prometheusreceiver/config.go b/receiver/prometheusreceiver/config.go index 533696dad855..8d796eb03260 100644 --- a/receiver/prometheusreceiver/config.go +++ b/receiver/prometheusreceiver/config.go @@ -80,7 +80,7 @@ type targetAllocator struct { HTTPSDConfig *promHTTP.SDConfig `mapstructure:"-"` } -var _ component.ReceiverConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) var _ confmap.Unmarshaler = (*Config)(nil) func checkFile(fn string) error { diff --git a/receiver/prometheusreceiver/config_test.go b/receiver/prometheusreceiver/config_test.go index 2885c0523293..c1c5dcd82d39 100644 --- a/receiver/prometheusreceiver/config_test.go +++ b/receiver/prometheusreceiver/config_test.go @@ -37,14 +37,14 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) r0 := cfg.(*Config) assert.Equal(t, r0, factory.CreateDefaultConfig()) sub, err = cm.Sub(component.NewIDWithName(typeStr, "customname").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) r1 := cfg.(*Config) assert.Equal(t, r1.ReceiverSettings, config.NewReceiverSettings(component.NewID(typeStr))) @@ -69,7 +69,7 @@ func TestLoadTargetAllocatorConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) r0 := cfg.(*Config) assert.Nil(t, r0.PrometheusConfig) @@ -80,7 +80,7 @@ func TestLoadTargetAllocatorConfig(t *testing.T) { sub, err = cm.Sub(component.NewIDWithName(typeStr, "withScrape").String()) require.NoError(t, err) cfg = factory.CreateDefaultConfig() - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) r1 := cfg.(*Config) assert.Nil(t, r0.PrometheusConfig) @@ -95,7 +95,7 @@ func TestLoadTargetAllocatorConfig(t *testing.T) { sub, err = cm.Sub(component.NewIDWithName(typeStr, "withOnlyScrape").String()) require.NoError(t, err) cfg = factory.CreateDefaultConfig() - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) r2 := cfg.(*Config) assert.Equal(t, 1, len(r2.PrometheusConfig.ScrapeConfigs)) @@ -111,7 +111,7 @@ func TestLoadConfigFailsOnUnknownSection(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.Error(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.Error(t, component.UnmarshalConfig(sub, cfg)) } // As one of the config parameters is consuming prometheus @@ -125,7 +125,7 @@ func TestLoadConfigFailsOnUnknownPrometheusSection(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.Error(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.Error(t, component.UnmarshalConfig(sub, cfg)) } // Renaming is not allowed @@ -137,7 +137,7 @@ func TestLoadConfigFailsOnRenameDisallowed(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Error(t, component.ValidateConfig(cfg)) } @@ -150,7 +150,7 @@ func TestRejectUnsupportedPrometheusFeatures(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") @@ -175,7 +175,7 @@ func TestNonExistentAuthCredentialsFile(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") @@ -194,7 +194,7 @@ func TestTLSConfigNonExistentCertFile(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") @@ -213,7 +213,7 @@ func TestTLSConfigNonExistentKeyFile(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") @@ -232,7 +232,7 @@ func TestTLSConfigCertFileWithoutKeyFile(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") @@ -251,7 +251,7 @@ func TestTLSConfigKeyFileWithoutCertFile(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") @@ -270,7 +270,7 @@ func TestKubernetesSDConfigWithoutKeyFile(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") @@ -289,7 +289,7 @@ func TestFileSDConfigJsonNilTargetGroup(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") @@ -308,7 +308,7 @@ func TestFileSDConfigYamlNilTargetGroup(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) err = component.ValidateConfig(cfg) require.NotNil(t, err, "Expected a non-nil error") diff --git a/receiver/prometheusreceiver/factory.go b/receiver/prometheusreceiver/factory.go index e69828378c8a..edc80f168ce9 100644 --- a/receiver/prometheusreceiver/factory.go +++ b/receiver/prometheusreceiver/factory.go @@ -42,7 +42,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), } @@ -51,7 +51,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { return newPrometheusReceiver(set, cfg.(*Config), nextConsumer, featuregate.GetRegistry()), nil diff --git a/receiver/prometheusreceiver/factory_test.go b/receiver/prometheusreceiver/factory_test.go index 59a2f753ad99..28757542cb7e 100644 --- a/receiver/prometheusreceiver/factory_test.go +++ b/receiver/prometheusreceiver/factory_test.go @@ -50,5 +50,5 @@ func TestFactoryCanParseServiceDiscoveryConfigs(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - assert.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + assert.NoError(t, component.UnmarshalConfig(sub, cfg)) } diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index 05faf57e23cc..4047145c3da3 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -12,13 +12,13 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/featuregate v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 diff --git a/receiver/prometheusreceiver/go.sum b/receiver/prometheusreceiver/go.sum index 1d8035768771..37837e0e6a03 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -649,21 +649,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/receiver/pulsarreceiver/config.go b/receiver/pulsarreceiver/config.go index 6b1d39179f2c..4651f109a633 100644 --- a/receiver/pulsarreceiver/config.go +++ b/receiver/pulsarreceiver/config.go @@ -74,7 +74,7 @@ type OAuth2 struct { Audience string `mapstructure:"audience"` } -var _ component.ReceiverConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks the receiver configuration is valid func (cfg *Config) Validate() error { diff --git a/receiver/pulsarreceiver/config_test.go b/receiver/pulsarreceiver/config_test.go index 1830e90174e3..37ac51ad6bd1 100644 --- a/receiver/pulsarreceiver/config_test.go +++ b/receiver/pulsarreceiver/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), diff --git a/receiver/pulsarreceiver/factory.go b/receiver/pulsarreceiver/factory.go index 9fdd80d11eeb..dcd9411f8785 100644 --- a/receiver/pulsarreceiver/factory.go +++ b/receiver/pulsarreceiver/factory.go @@ -93,7 +93,7 @@ type pulsarReceiverFactory struct { func (f *pulsarReceiverFactory) createTracesReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { c := *(cfg.(*Config)) @@ -110,7 +110,7 @@ func (f *pulsarReceiverFactory) createTracesReceiver( func (f *pulsarReceiverFactory) createMetricsReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { c := *(cfg.(*Config)) @@ -127,7 +127,7 @@ func (f *pulsarReceiverFactory) createMetricsReceiver( func (f *pulsarReceiverFactory) createLogsReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Logs, ) (component.LogsReceiver, error) { c := *(cfg.(*Config)) @@ -141,7 +141,7 @@ func (f *pulsarReceiverFactory) createLogsReceiver( return r, nil } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Encoding: defaultEncoding, diff --git a/receiver/pulsarreceiver/go.mod b/receiver/pulsarreceiver/go.mod index 65e11d1f333f..9593e755039e 100644 --- a/receiver/pulsarreceiver/go.mod +++ b/receiver/pulsarreceiver/go.mod @@ -11,11 +11,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.66.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -62,7 +62,7 @@ require ( github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/pulsarreceiver/go.sum b/receiver/pulsarreceiver/go.sum index ed1dfb60b4ef..f23c8c5b18cc 100644 --- a/receiver/pulsarreceiver/go.sum +++ b/receiver/pulsarreceiver/go.sum @@ -486,18 +486,18 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/purefareceiver/config.go b/receiver/purefareceiver/config.go index ed5b9daeedf3..69caa2361d05 100644 --- a/receiver/purefareceiver/config.go +++ b/receiver/purefareceiver/config.go @@ -23,7 +23,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" ) -var _ component.ReceiverConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Config relating to Array Metric Scraper. type Config struct { diff --git a/receiver/purefareceiver/config_test.go b/receiver/purefareceiver/config_test.go index 6e72b1898e4f..d3ec9776f2e8 100644 --- a/receiver/purefareceiver/config_test.go +++ b/receiver/purefareceiver/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewID(typeStr), @@ -51,7 +51,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/purefareceiver/factory.go b/receiver/purefareceiver/factory.go index b6af9f3d2d1e..15fc65cd5f6d 100644 --- a/receiver/purefareceiver/factory.go +++ b/receiver/purefareceiver/factory.go @@ -34,7 +34,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{}, diff --git a/receiver/purefareceiver/go.mod b/receiver/purefareceiver/go.mod index 8ea4d93450ba..1a07e426d9fb 100644 --- a/receiver/purefareceiver/go.mod +++ b/receiver/purefareceiver/go.mod @@ -4,9 +4,9 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -29,8 +29,8 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/featuregate v0.65.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/purefareceiver/go.sum b/receiver/purefareceiver/go.sum index 9295e835ee02..97d293a16a8a 100644 --- a/receiver/purefareceiver/go.sum +++ b/receiver/purefareceiver/go.sum @@ -266,16 +266,16 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.65.0 h1:Z0fLrzFgbHdkS3msfEXYgXN9273sXF4oRJ75IItlcgk= -go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/purefareceiver/receiver.go b/receiver/purefareceiver/receiver.go index 6865b7a359d2..2c38d5c097f9 100644 --- a/receiver/purefareceiver/receiver.go +++ b/receiver/purefareceiver/receiver.go @@ -24,7 +24,7 @@ import ( func createMetricsReceiver( _ context.Context, set component.ReceiverCreateSettings, - rCfg component.ReceiverConfig, + rCfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { return nil, nil diff --git a/receiver/rabbitmqreceiver/config_test.go b/receiver/rabbitmqreceiver/config_test.go index deffefaabbee..3d0317a996f4 100644 --- a/receiver/rabbitmqreceiver/config_test.go +++ b/receiver/rabbitmqreceiver/config_test.go @@ -121,7 +121,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "http://localhost:15672" diff --git a/receiver/rabbitmqreceiver/factory.go b/receiver/rabbitmqreceiver/factory.go index 0cc19df5c8d2..b9523f59f9e9 100644 --- a/receiver/rabbitmqreceiver/factory.go +++ b/receiver/rabbitmqreceiver/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -57,7 +57,7 @@ func createDefaultConfig() component.ReceiverConfig { } } -func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf component.ReceiverConfig, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf component.Config, consumer consumer.Metrics) (component.MetricsReceiver, error) { cfg, ok := rConf.(*Config) if !ok { return nil, errConfigNotRabbit diff --git a/receiver/rabbitmqreceiver/factory_test.go b/receiver/rabbitmqreceiver/factory_test.go index e24f4260e702..ae15bbafa1a6 100644 --- a/receiver/rabbitmqreceiver/factory_test.go +++ b/receiver/rabbitmqreceiver/factory_test.go @@ -47,7 +47,7 @@ func TestNewFactory(t *testing.T) { testFunc: func(t *testing.T) { factory := NewFactory() - var expectedCfg component.ReceiverConfig = &Config{ + var expectedCfg component.Config = &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, diff --git a/receiver/rabbitmqreceiver/go.mod b/receiver/rabbitmqreceiver/go.mod index f4ea7e571911..2b1a554134f1 100644 --- a/receiver/rabbitmqreceiver/go.mod +++ b/receiver/rabbitmqreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -57,7 +57,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/rabbitmqreceiver/go.sum b/receiver/rabbitmqreceiver/go.sum index 86fc6394588f..9544f45377d4 100644 --- a/receiver/rabbitmqreceiver/go.sum +++ b/receiver/rabbitmqreceiver/go.sum @@ -829,16 +829,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/receivercreator/config_test.go b/receiver/receivercreator/config_test.go index 9fa64da238c4..457dda7cdbe2 100644 --- a/receiver/receivercreator/config_test.go +++ b/receiver/receivercreator/config_test.go @@ -64,7 +64,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -122,7 +122,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) @@ -171,7 +171,7 @@ type nopWithEndpointReceiver struct { component.ReceiverCreateSettings } -func (*nopWithEndpointFactory) CreateDefaultConfig() component.ReceiverConfig { +func (*nopWithEndpointFactory) CreateDefaultConfig() component.Config { return &nopWithEndpointConfig{ ReceiverSettings: config.NewReceiverSettings(component.NewID("nop")), } @@ -185,7 +185,7 @@ type mockComponent struct { func (*nopWithEndpointFactory) CreateMetricsReceiver( ctx context.Context, rcs component.ReceiverCreateSettings, - _ component.ReceiverConfig, + _ component.Config, nextConsumer consumer.Metrics) (component.MetricsReceiver, error) { return &nopWithEndpointReceiver{ Component: mockComponent{}, diff --git a/receiver/receivercreator/factory.go b/receiver/receivercreator/factory.go index be6d3e37635e..c5105c2aae39 100644 --- a/receiver/receivercreator/factory.go +++ b/receiver/receivercreator/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), ResourceAttributes: resourceAttributes{ @@ -70,7 +70,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { return newReceiverCreator(params, cfg.(*Config), consumer) diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index b9a7e9307824..f3667841cdd2 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -9,11 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.66.0 github.com/spf13/cast v1.5.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -58,8 +58,8 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index 5cb6f3756c74..df65e4bace8f 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -416,21 +416,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/receiver/receivercreator/receiver_test.go b/receiver/receivercreator/receiver_test.go index 09095ee9935e..85a78203739e 100644 --- a/receiver/receivercreator/receiver_test.go +++ b/receiver/receivercreator/receiver_test.go @@ -84,7 +84,7 @@ func TestMockedEndToEnd(t *testing.T) { cfg := factory.CreateDefaultConfig() sub, err := cm.Sub(component.NewIDWithName(typeStr, "1").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) params := componenttest.NewNopReceiverCreateSettings() mockConsumer := new(consumertest.MetricsSink) diff --git a/receiver/receivercreator/runner.go b/receiver/receivercreator/runner.go index 85c64cdaafd5..6f794d5d95e7 100644 --- a/receiver/receivercreator/runner.go +++ b/receiver/receivercreator/runner.go @@ -83,7 +83,7 @@ func (run *receiverRunner) loadRuntimeReceiverConfig( factory component.ReceiverFactory, receiver receiverConfig, discoveredConfig userConfigMap, -) (component.ReceiverConfig, error) { +) (component.Config, error) { // Merge in the config values specified in the config file. mergedConfig := confmap.NewFromStringMap(receiver.config) @@ -95,7 +95,7 @@ func (run *receiverRunner) loadRuntimeReceiverConfig( receiverCfg := factory.CreateDefaultConfig() receiverCfg.SetIDName(receiver.id.Name()) - if err := component.UnmarshalReceiverConfig(mergedConfig, receiverCfg); err != nil { + if err := component.UnmarshalConfig(mergedConfig, receiverCfg); err != nil { return nil, fmt.Errorf("failed to load template config: %w", err) } // Sets dynamically created receiver to something like receiver_creator/1/redis{endpoint="localhost:6380"}/. @@ -106,7 +106,7 @@ func (run *receiverRunner) loadRuntimeReceiverConfig( // createRuntimeReceiver creates a receiver that is discovered at runtime. func (run *receiverRunner) createRuntimeReceiver( factory component.ReceiverFactory, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { runParams := run.params diff --git a/receiver/redisreceiver/config_test.go b/receiver/redisreceiver/config_test.go index 1205be0f4d5f..877c3d9d30e6 100644 --- a/receiver/redisreceiver/config_test.go +++ b/receiver/redisreceiver/config_test.go @@ -39,7 +39,7 @@ func TestConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, &Config{ diff --git a/receiver/redisreceiver/factory.go b/receiver/redisreceiver/factory.go index e46f1d952bf7..aebce01c2c35 100644 --- a/receiver/redisreceiver/factory.go +++ b/receiver/redisreceiver/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { scs := scraperhelper.NewDefaultScraperControllerSettings(typeStr) scs.CollectionInterval = 10 * time.Second return &Config{ @@ -58,7 +58,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( ctx context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { oCfg := cfg.(*Config) diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index a44bbc04708c..30a1c0f143f8 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/go-redis/redis/v7 v7.4.1 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -52,7 +52,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index 3a3a4dc4ba1f..8de5ee1180c2 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -829,16 +829,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/riakreceiver/factory.go b/receiver/riakreceiver/factory.go index e04a48656916..725984af4a93 100644 --- a/receiver/riakreceiver/factory.go +++ b/receiver/riakreceiver/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -57,7 +57,7 @@ func createDefaultConfig() component.ReceiverConfig { } } -func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf component.ReceiverConfig, consumer consumer.Metrics) (component.MetricsReceiver, error) { +func createMetricsReceiver(ctx context.Context, params component.ReceiverCreateSettings, rConf component.Config, consumer consumer.Metrics) (component.MetricsReceiver, error) { cfg, ok := rConf.(*Config) if !ok { return nil, errConfigNotRiak diff --git a/receiver/riakreceiver/factory_test.go b/receiver/riakreceiver/factory_test.go index 4973eb713db3..bc078e6d232c 100644 --- a/receiver/riakreceiver/factory_test.go +++ b/receiver/riakreceiver/factory_test.go @@ -47,7 +47,7 @@ func TestNewFactory(t *testing.T) { testFunc: func(t *testing.T) { factory := NewFactory() - var expectedCfg component.ReceiverConfig = &Config{ + var expectedCfg component.Config = &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, diff --git a/receiver/riakreceiver/go.mod b/receiver/riakreceiver/go.mod index c775e6f794d4..9610abf6a420 100644 --- a/receiver/riakreceiver/go.mod +++ b/receiver/riakreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -57,7 +57,7 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/riakreceiver/go.sum b/receiver/riakreceiver/go.sum index 86fc6394588f..9544f45377d4 100644 --- a/receiver/riakreceiver/go.sum +++ b/receiver/riakreceiver/go.sum @@ -829,16 +829,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/saphanareceiver/config_test.go b/receiver/saphanareceiver/config_test.go index 43d9fba8905f..f91789d82cc1 100644 --- a/receiver/saphanareceiver/config_test.go +++ b/receiver/saphanareceiver/config_test.go @@ -92,7 +92,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Metrics = metadata.DefaultMetricsSettings() diff --git a/receiver/saphanareceiver/factory.go b/receiver/saphanareceiver/factory.go index c4a314137ef3..603a3286d2f8 100644 --- a/receiver/saphanareceiver/factory.go +++ b/receiver/saphanareceiver/factory.go @@ -42,7 +42,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { scs := scraperhelper.NewDefaultScraperControllerSettings(typeStr) scs.CollectionInterval = 10 * time.Second return &Config{ @@ -62,7 +62,7 @@ var errConfigNotSAPHANA = errors.New("config was not an sap hana receiver config func createMetricsReceiver( ctx context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { c, ok := cfg.(*Config) diff --git a/receiver/saphanareceiver/go.mod b/receiver/saphanareceiver/go.mod index 3e8d1ab0666c..ed5c31ef3a05 100644 --- a/receiver/saphanareceiver/go.mod +++ b/receiver/saphanareceiver/go.mod @@ -7,10 +7,10 @@ require ( github.com/google/go-cmp v0.5.9 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 ) @@ -32,7 +32,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/saphanareceiver/go.sum b/receiver/saphanareceiver/go.sum index 610ec5cec78a..9b19e043d1c8 100644 --- a/receiver/saphanareceiver/go.sum +++ b/receiver/saphanareceiver/go.sum @@ -286,16 +286,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/sapmreceiver/config_test.go b/receiver/sapmreceiver/config_test.go index 8d573de01041..193a121018e3 100644 --- a/receiver/sapmreceiver/config_test.go +++ b/receiver/sapmreceiver/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -88,7 +88,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/sapmreceiver/factory.go b/receiver/sapmreceiver/factory.go index 2b631d257399..6226dc7645f9 100644 --- a/receiver/sapmreceiver/factory.go +++ b/receiver/sapmreceiver/factory.go @@ -46,7 +46,7 @@ func NewFactory() component.ReceiverFactory { component.WithTracesReceiver(createTracesReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ @@ -86,7 +86,7 @@ func (rCfg *Config) validate() error { func createTracesReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { // assert config is SAPM config diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index b1f2ea096ce4..ad59ea89f402 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -10,11 +10,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0 github.com/signalfx/sapm-proto v0.12.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -42,7 +42,7 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index a97b7b3ce0dd..eb2c8d5aa9ee 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -300,18 +300,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/signalfxreceiver/config_test.go b/receiver/signalfxreceiver/config_test.go index 6da28dd55271..a1304fb927cd 100644 --- a/receiver/signalfxreceiver/config_test.go +++ b/receiver/signalfxreceiver/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -82,7 +82,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/signalfxreceiver/factory.go b/receiver/signalfxreceiver/factory.go index 1cfe2fdb7a5c..640b324fc7b7 100644 --- a/receiver/signalfxreceiver/factory.go +++ b/receiver/signalfxreceiver/factory.go @@ -48,7 +48,7 @@ func NewFactory() component.ReceiverFactory { component.WithLogsReceiver(createLogsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ @@ -91,7 +91,7 @@ func (rCfg *Config) validate() error { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { rCfg := cfg.(*Config) @@ -121,7 +121,7 @@ func createMetricsReceiver( func createLogsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Logs, ) (component.LogsReceiver, error) { rCfg := cfg.(*Config) diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index 2df905a27e06..6378d34cca09 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -11,11 +11,11 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -62,7 +62,7 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index e4ee555a6af2..be7ad9ea7e04 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -1231,18 +1231,18 @@ go.opentelemetry.io/collector v0.52.0/go.mod h1:a9GvaOhyc0nVOUzqvdv5mxyWghCSso/W go.opentelemetry.io/collector v0.54.0/go.mod h1:FgNzyfb4sAGb5cqusB5znETJ8Pz4OQUBGbOeGIZ2rlQ= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.65.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= go.opentelemetry.io/collector/component v0.65.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= go.opentelemetry.io/collector/consumer v0.65.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/model v0.49.0/go.mod h1:nOYQv9KoFPs6ihJwOi24qB209EOhS9HkwhGj54YiEAw= go.opentelemetry.io/collector/pdata v0.49.0/go.mod h1:YwmKuiFhNgtmhRdpi8Q8FAWPa0AwJTCSlssSsAtuRcY= go.opentelemetry.io/collector/pdata v0.52.0/go.mod h1:GJUTfTv8mlYpHRjcmHXVbvJr48EW/q/P/HuBvpXAE58= @@ -1250,16 +1250,16 @@ go.opentelemetry.io/collector/pdata v0.54.0/go.mod h1:1nSelv/YqGwdHHaIKNW9ZOHSMq go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.65.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/collector/processor/batchprocessor v0.65.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= go.opentelemetry.io/collector/semconv v0.52.0/go.mod h1:SxK0rUnUP7YeDakexzbE/vhimTOHwE6m/4aKKd9e27Q= go.opentelemetry.io/collector/semconv v0.54.0/go.mod h1:HAGkPKNMhc4kEHevEqVIEtUuvsRQMIbUWBb8yBrqEwk= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.65.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0/go.mod h1:J0dBVrt7dPS/lKJyQoW0xzQiUr4r2Ik1VwPjAUWnofI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= diff --git a/receiver/simpleprometheusreceiver/config_test.go b/receiver/simpleprometheusreceiver/config_test.go index 78bfef7970ee..1970f1b5a5ef 100644 --- a/receiver/simpleprometheusreceiver/config_test.go +++ b/receiver/simpleprometheusreceiver/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -98,7 +98,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/simpleprometheusreceiver/factory.go b/receiver/simpleprometheusreceiver/factory.go index 5aba36a714a1..4df18749d998 100644 --- a/receiver/simpleprometheusreceiver/factory.go +++ b/receiver/simpleprometheusreceiver/factory.go @@ -46,7 +46,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPClientSettings: confighttp.HTTPClientSettings{ @@ -63,7 +63,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { rCfg := cfg.(*Config) diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index 06542bde471f..49826f37e1a8 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -7,9 +7,9 @@ require ( github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v0.38.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 k8s.io/client-go v0.25.4 ) @@ -121,9 +121,9 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index 4aa308d48e22..67c42f254291 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -622,19 +622,19 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= diff --git a/receiver/skywalkingreceiver/config.go b/receiver/skywalkingreceiver/config.go index 840be120083c..231d0048baf0 100644 --- a/receiver/skywalkingreceiver/config.go +++ b/receiver/skywalkingreceiver/config.go @@ -41,7 +41,7 @@ type Config struct { Protocols `mapstructure:"protocols"` } -var _ component.ReceiverConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) var _ confmap.Unmarshaler = (*Config)(nil) // Validate checks the receiver configuration is valid diff --git a/receiver/skywalkingreceiver/config_test.go b/receiver/skywalkingreceiver/config_test.go index c002cc331bea..c3aac31ac188 100644 --- a/receiver/skywalkingreceiver/config_test.go +++ b/receiver/skywalkingreceiver/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewIDWithName(typeStr, ""), @@ -76,7 +76,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/skywalkingreceiver/factory.go b/receiver/skywalkingreceiver/factory.go index 6a24812713c3..2cd371205033 100644 --- a/receiver/skywalkingreceiver/factory.go +++ b/receiver/skywalkingreceiver/factory.go @@ -52,7 +52,7 @@ func NewFactory() component.ReceiverFactory { } // CreateDefaultConfig creates the default configuration for Skywalking receiver. -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Protocols: Protocols{ @@ -73,7 +73,7 @@ func createDefaultConfig() component.ReceiverConfig { func createTracesReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { diff --git a/receiver/skywalkingreceiver/factory_test.go b/receiver/skywalkingreceiver/factory_test.go index dffc73e233e3..220f4c18b170 100644 --- a/receiver/skywalkingreceiver/factory_test.go +++ b/receiver/skywalkingreceiver/factory_test.go @@ -71,7 +71,7 @@ func TestCreateReceiverGeneralConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "customname").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) set := componenttest.NewNopReceiverCreateSettings() tReceiver, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) diff --git a/receiver/skywalkingreceiver/go.mod b/receiver/skywalkingreceiver/go.mod index e087f95a7ac3..e47e01fb59d0 100644 --- a/receiver/skywalkingreceiver/go.mod +++ b/receiver/skywalkingreceiver/go.mod @@ -6,11 +6,11 @@ require ( github.com/google/uuid v1.3.0 github.com/gorilla/mux v1.8.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 google.golang.org/grpc v1.51.0 google.golang.org/protobuf v1.28.1 @@ -40,7 +40,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect diff --git a/receiver/skywalkingreceiver/go.sum b/receiver/skywalkingreceiver/go.sum index 18f9c4286ce1..34b7c1f348ab 100644 --- a/receiver/skywalkingreceiver/go.sum +++ b/receiver/skywalkingreceiver/go.sum @@ -418,18 +418,18 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= diff --git a/receiver/snmpreceiver/config_test.go b/receiver/snmpreceiver/config_test.go index 4ca4df4daeb0..2cefc235ecb6 100644 --- a/receiver/snmpreceiver/config_test.go +++ b/receiver/snmpreceiver/config_test.go @@ -262,7 +262,7 @@ func TestLoadConfigConnectionConfigs(t *testing.T) { require.NoError(t, err) cfg := factory.CreateDefaultConfig() - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if test.expectedErr == "" { require.NoError(t, component.ValidateConfig(cfg)) } else { @@ -846,7 +846,7 @@ func TestLoadConfigMetricConfigs(t *testing.T) { require.NoError(t, err) cfg := factory.CreateDefaultConfig() - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if test.expectedErr == "" { require.NoError(t, component.ValidateConfig(cfg)) } else { diff --git a/receiver/snmpreceiver/factory.go b/receiver/snmpreceiver/factory.go index b613da3dcc5f..fd30dffee8d5 100644 --- a/receiver/snmpreceiver/factory.go +++ b/receiver/snmpreceiver/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig creates a config for SNMP with as many default values as possible -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -62,7 +62,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - config component.ReceiverConfig, + config component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { snmpConfig, ok := config.(*Config) diff --git a/receiver/snmpreceiver/factory_test.go b/receiver/snmpreceiver/factory_test.go index c1417a85b384..ba0475f66cfe 100644 --- a/receiver/snmpreceiver/factory_test.go +++ b/receiver/snmpreceiver/factory_test.go @@ -43,7 +43,7 @@ func TestNewFactory(t *testing.T) { testFunc: func(t *testing.T) { factory := NewFactory() - var expectedCfg component.ReceiverConfig = &Config{ + var expectedCfg component.Config = &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: defaultCollectionInterval, diff --git a/receiver/snmpreceiver/go.mod b/receiver/snmpreceiver/go.mod index b95620b1f528..52658ea5ccf5 100644 --- a/receiver/snmpreceiver/go.mod +++ b/receiver/snmpreceiver/go.mod @@ -7,10 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -74,9 +74,9 @@ require ( github.com/tklauser/numcpus v0.4.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect diff --git a/receiver/snmpreceiver/go.sum b/receiver/snmpreceiver/go.sum index a08637ce7cf5..67cd48af5b90 100644 --- a/receiver/snmpreceiver/go.sum +++ b/receiver/snmpreceiver/go.sum @@ -879,21 +879,21 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0 h1:T5JJIJ3cmClqdSMgkbjoIiP9p059AAvbfcd3houJkxM= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= go.opentelemetry.io/contrib/zpages v0.36.4 h1:Z2VK5WsDhWs9VwZ1p0TM5RyusTOgAQfdMMDDQPRnlmY= diff --git a/receiver/solacereceiver/config_test.go b/receiver/solacereceiver/config_test.go index a608bcdfecb8..3e1ac776ec6f 100644 --- a/receiver/solacereceiver/config_test.go +++ b/receiver/solacereceiver/config_test.go @@ -34,7 +34,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config expectedErr error }{ { @@ -73,7 +73,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expectedErr != nil { assert.ErrorIs(t, component.ValidateConfig(cfg), tt.expectedErr) diff --git a/receiver/solacereceiver/factory.go b/receiver/solacereceiver/factory.go index 973b6b99827a..fcccf3b1148b 100644 --- a/receiver/solacereceiver/factory.go +++ b/receiver/solacereceiver/factory.go @@ -44,7 +44,7 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig creates the default configuration for receiver. -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(componentType)), Broker: []string{defaultHost}, @@ -61,7 +61,7 @@ func createDefaultConfig() component.ReceiverConfig { func createTracesReceiver( _ context.Context, params component.ReceiverCreateSettings, - receiverConfig component.ReceiverConfig, + receiverConfig component.Config, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { cfg, ok := receiverConfig.(*Config) diff --git a/receiver/solacereceiver/factory_test.go b/receiver/solacereceiver/factory_test.go index 5daae0d58b43..cdec4ded4845 100644 --- a/receiver/solacereceiver/factory_test.go +++ b/receiver/solacereceiver/factory_test.go @@ -37,7 +37,7 @@ func TestCreateTracesReceiver(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(componentType, "primary").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) receiver, err := factory.CreateTracesReceiver( context.Background(), @@ -104,7 +104,7 @@ func TestCreateTracesReceiverBadMetrics(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(componentType, "primary").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) receiver, err := factory.CreateTracesReceiver( context.Background(), diff --git a/receiver/solacereceiver/go.mod b/receiver/solacereceiver/go.mod index 2b4df8827bf9..c12362463af0 100644 --- a/receiver/solacereceiver/go.mod +++ b/receiver/solacereceiver/go.mod @@ -20,10 +20,10 @@ require ( github.com/Azure/go-amqp v0.17.5 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 go.uber.org/zap v1.23.0 google.golang.org/protobuf v1.28.1 @@ -43,7 +43,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/solacereceiver/go.sum b/receiver/solacereceiver/go.sum index ff99f3f6a004..5e222457f2db 100644 --- a/receiver/solacereceiver/go.sum +++ b/receiver/solacereceiver/go.sum @@ -273,16 +273,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= diff --git a/receiver/splunkhecreceiver/config_test.go b/receiver/splunkhecreceiver/config_test.go index 6e717a382a54..87041f540723 100644 --- a/receiver/splunkhecreceiver/config_test.go +++ b/receiver/splunkhecreceiver/config_test.go @@ -37,7 +37,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewID(typeStr), @@ -98,7 +98,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/splunkhecreceiver/factory.go b/receiver/splunkhecreceiver/factory.go index 8d4a2ce7c34a..0a3403a479dd 100644 --- a/receiver/splunkhecreceiver/factory.go +++ b/receiver/splunkhecreceiver/factory.go @@ -49,7 +49,7 @@ func NewFactory() component.ReceiverFactory { } // CreateDefaultConfig creates the default configuration for Splunk HEC receiver. -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ @@ -71,7 +71,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { @@ -88,7 +88,7 @@ func createMetricsReceiver( func createLogsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Logs, ) (component.LogsReceiver, error) { diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index 1a00aa26ee2d..a1a8a65e719b 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -9,11 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -38,7 +38,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index 7f26591a3737..5337a52e03d9 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -285,18 +285,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/sqlqueryreceiver/config.go b/receiver/sqlqueryreceiver/config.go index c28de628d0a8..6504a15be28e 100644 --- a/receiver/sqlqueryreceiver/config.go +++ b/receiver/sqlqueryreceiver/config.go @@ -158,7 +158,7 @@ func (a MetricAggregation) Validate() error { return fmt.Errorf("metric config has unsupported aggregation: '%s'", a) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), diff --git a/receiver/sqlqueryreceiver/config_test.go b/receiver/sqlqueryreceiver/config_test.go index 2bf9be2fe675..8d6c1e371de0 100644 --- a/receiver/sqlqueryreceiver/config_test.go +++ b/receiver/sqlqueryreceiver/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { fname string id component.ID - expected component.ReceiverConfig + expected component.Config errorMessage string }{ { @@ -132,7 +132,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expected == nil { assert.ErrorContains(t, component.ValidateConfig(cfg), tt.errorMessage) @@ -158,7 +158,7 @@ func TestConfig_Validate_Multierr(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) err = component.ValidateConfig(cfg) diff --git a/receiver/sqlqueryreceiver/go.mod b/receiver/sqlqueryreceiver/go.mod index 00ce6f54139e..6e425716b998 100644 --- a/receiver/sqlqueryreceiver/go.mod +++ b/receiver/sqlqueryreceiver/go.mod @@ -12,10 +12,10 @@ require ( github.com/snowflakedb/gosnowflake v1.6.15 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -90,7 +90,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/sirupsen/logrus v1.9.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/sqlqueryreceiver/go.sum b/receiver/sqlqueryreceiver/go.sum index 47c3ae64a521..2b04bc0aa248 100644 --- a/receiver/sqlqueryreceiver/go.sum +++ b/receiver/sqlqueryreceiver/go.sum @@ -958,16 +958,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/sqlqueryreceiver/receiver.go b/receiver/sqlqueryreceiver/receiver.go index e4ee1abe1403..967b310d4379 100644 --- a/receiver/sqlqueryreceiver/receiver.go +++ b/receiver/sqlqueryreceiver/receiver.go @@ -35,7 +35,7 @@ func createReceiverFunc(sqlOpenerFunc sqlOpenerFunc, clientProviderFunc clientPr return func( ctx context.Context, settings component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { sqlCfg := cfg.(*Config) diff --git a/receiver/sqlserverreceiver/config_test.go b/receiver/sqlserverreceiver/config_test.go index f180956a1f76..0c0e406df4a3 100644 --- a/receiver/sqlserverreceiver/config_test.go +++ b/receiver/sqlserverreceiver/config_test.go @@ -61,7 +61,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub("sqlserver") require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, factory.CreateDefaultConfig(), cfg) diff --git a/receiver/sqlserverreceiver/factory.go b/receiver/sqlserverreceiver/factory.go index 8dbaf01dd3f3..4a6d1c96ded0 100644 --- a/receiver/sqlserverreceiver/factory.go +++ b/receiver/sqlserverreceiver/factory.go @@ -37,7 +37,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), diff --git a/receiver/sqlserverreceiver/factory_others.go b/receiver/sqlserverreceiver/factory_others.go index d8a1f99fe58c..da9cf3162b01 100644 --- a/receiver/sqlserverreceiver/factory_others.go +++ b/receiver/sqlserverreceiver/factory_others.go @@ -29,7 +29,7 @@ import ( func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { return nil, errors.New("the sqlserver receiver is only supported on Windows") diff --git a/receiver/sqlserverreceiver/factory_test.go b/receiver/sqlserverreceiver/factory_test.go index 57aa2500dabb..f6a77ec20905 100644 --- a/receiver/sqlserverreceiver/factory_test.go +++ b/receiver/sqlserverreceiver/factory_test.go @@ -43,7 +43,7 @@ func TestNewFactory(t *testing.T) { testFunc: func(t *testing.T) { factory := NewFactory() - var expectedCfg component.ReceiverConfig = &Config{ + var expectedCfg component.Config = &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), CollectionInterval: 10 * time.Second, diff --git a/receiver/sqlserverreceiver/factory_windows.go b/receiver/sqlserverreceiver/factory_windows.go index 98e4a9750971..fa6b5e82af74 100644 --- a/receiver/sqlserverreceiver/factory_windows.go +++ b/receiver/sqlserverreceiver/factory_windows.go @@ -32,7 +32,7 @@ var errConfigNotSqlServer = errors.New("config was not a sqlserver receiver conf func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - receiverCfg component.ReceiverConfig, + receiverCfg component.Config, metricsConsumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg, ok := receiverCfg.(*Config) diff --git a/receiver/sqlserverreceiver/go.mod b/receiver/sqlserverreceiver/go.mod index 562aaa1569c9..412029edda1d 100644 --- a/receiver/sqlserverreceiver/go.mod +++ b/receiver/sqlserverreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -32,7 +32,7 @@ require ( github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/sqlserverreceiver/go.sum b/receiver/sqlserverreceiver/go.sum index ee9cfe4e3034..40f7294872af 100644 --- a/receiver/sqlserverreceiver/go.sum +++ b/receiver/sqlserverreceiver/go.sum @@ -284,16 +284,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/statsdreceiver/config_test.go b/receiver/statsdreceiver/config_test.go index b59fd6daf6be..32bab37f4fc8 100644 --- a/receiver/statsdreceiver/config_test.go +++ b/receiver/statsdreceiver/config_test.go @@ -38,7 +38,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewID(typeStr), @@ -77,7 +77,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/statsdreceiver/factory.go b/receiver/statsdreceiver/factory.go index 0f3fa98f2b74..447448986e84 100644 --- a/receiver/statsdreceiver/factory.go +++ b/receiver/statsdreceiver/factory.go @@ -50,7 +50,7 @@ func NewFactory() component.ReceiverFactory { ) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), NetAddr: confignet.NetAddr{ @@ -67,7 +67,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { c := cfg.(*Config) diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index 32b86e762116..0515aad92f4d 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -8,10 +8,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.opentelemetry.io/otel v1.11.1 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -45,7 +45,7 @@ require ( github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.33.0 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/sdk v1.11.1 // indirect diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index c3c682c2b136..de9443cdde87 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -373,17 +373,17 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index e608be8bd596..6260ec432653 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -5,10 +5,10 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -33,7 +33,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index 9feebfc4f5c2..a791a4a0417b 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -310,16 +310,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/syslogreceiver/syslog.go b/receiver/syslogreceiver/syslog.go index e619f4c74134..6620ed40b97b 100644 --- a/receiver/syslogreceiver/syslog.go +++ b/receiver/syslogreceiver/syslog.go @@ -46,7 +46,7 @@ func (f ReceiverType) Type() component.Type { } // CreateDefaultConfig creates a config with type and version -func (f ReceiverType) CreateDefaultConfig() component.ReceiverConfig { +func (f ReceiverType) CreateDefaultConfig() component.Config { return &SysLogConfig{ BaseConfig: adapter.BaseConfig{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -57,7 +57,7 @@ func (f ReceiverType) CreateDefaultConfig() component.ReceiverConfig { } // BaseConfig gets the base config from config, for now -func (f ReceiverType) BaseConfig(cfg component.ReceiverConfig) adapter.BaseConfig { +func (f ReceiverType) BaseConfig(cfg component.Config) adapter.BaseConfig { return cfg.(*SysLogConfig).BaseConfig } @@ -68,7 +68,7 @@ type SysLogConfig struct { } // InputConfig unmarshals the input operator -func (f ReceiverType) InputConfig(cfg component.ReceiverConfig) operator.Config { +func (f ReceiverType) InputConfig(cfg component.Config) operator.Config { return operator.NewConfig(&cfg.(*SysLogConfig).InputConfig) } diff --git a/receiver/syslogreceiver/syslog_test.go b/receiver/syslogreceiver/syslog_test.go index af6c34553a81..188cbde01c22 100644 --- a/receiver/syslogreceiver/syslog_test.go +++ b/receiver/syslogreceiver/syslog_test.go @@ -96,7 +96,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub("syslog") require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, testdataConfigYaml(), cfg) diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index 61be14ec9777..50ee5c270661 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -30,8 +30,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index c937c4943e70..bc0a23252984 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -306,16 +306,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/tcplogreceiver/tcp.go b/receiver/tcplogreceiver/tcp.go index 3dac50469b05..646d98ddf3c2 100644 --- a/receiver/tcplogreceiver/tcp.go +++ b/receiver/tcplogreceiver/tcp.go @@ -43,7 +43,7 @@ func (f ReceiverType) Type() component.Type { } // CreateDefaultConfig creates a config with type and version -func (f ReceiverType) CreateDefaultConfig() component.ReceiverConfig { +func (f ReceiverType) CreateDefaultConfig() component.Config { return &TCPLogConfig{ BaseConfig: adapter.BaseConfig{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -54,7 +54,7 @@ func (f ReceiverType) CreateDefaultConfig() component.ReceiverConfig { } // BaseConfig gets the base config from config, for now -func (f ReceiverType) BaseConfig(cfg component.ReceiverConfig) adapter.BaseConfig { +func (f ReceiverType) BaseConfig(cfg component.Config) adapter.BaseConfig { return cfg.(*TCPLogConfig).BaseConfig } @@ -65,6 +65,6 @@ type TCPLogConfig struct { } // InputConfig unmarshals the input operator -func (f ReceiverType) InputConfig(cfg component.ReceiverConfig) operator.Config { +func (f ReceiverType) InputConfig(cfg component.Config) operator.Config { return operator.NewConfig(&cfg.(*TCPLogConfig).InputConfig) } diff --git a/receiver/tcplogreceiver/tcp_test.go b/receiver/tcplogreceiver/tcp_test.go index 7ed5584ca83b..0cb44b2c367b 100644 --- a/receiver/tcplogreceiver/tcp_test.go +++ b/receiver/tcplogreceiver/tcp_test.go @@ -82,7 +82,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub("tcplog") require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, testdataConfigYaml(), cfg) diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index 270121d480b1..ab854b63c281 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 ) require ( @@ -29,8 +29,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index aab445409328..bc5848452b04 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -305,16 +305,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/udplogreceiver/udp.go b/receiver/udplogreceiver/udp.go index 8673794ac16f..00aadf29fcdd 100644 --- a/receiver/udplogreceiver/udp.go +++ b/receiver/udplogreceiver/udp.go @@ -43,7 +43,7 @@ func (f ReceiverType) Type() component.Type { } // CreateDefaultConfig creates a config with type and version -func (f ReceiverType) CreateDefaultConfig() component.ReceiverConfig { +func (f ReceiverType) CreateDefaultConfig() component.Config { return &UDPLogConfig{ BaseConfig: adapter.BaseConfig{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -54,7 +54,7 @@ func (f ReceiverType) CreateDefaultConfig() component.ReceiverConfig { } // BaseConfig gets the base config from config, for now -func (f ReceiverType) BaseConfig(cfg component.ReceiverConfig) adapter.BaseConfig { +func (f ReceiverType) BaseConfig(cfg component.Config) adapter.BaseConfig { return cfg.(*UDPLogConfig).BaseConfig } @@ -65,6 +65,6 @@ type UDPLogConfig struct { } // InputConfig unmarshals the input operator -func (f ReceiverType) InputConfig(cfg component.ReceiverConfig) operator.Config { +func (f ReceiverType) InputConfig(cfg component.Config) operator.Config { return operator.NewConfig(&cfg.(*UDPLogConfig).InputConfig) } diff --git a/receiver/udplogreceiver/udp_test.go b/receiver/udplogreceiver/udp_test.go index 60b4e40f1de3..1c89502873a5 100644 --- a/receiver/udplogreceiver/udp_test.go +++ b/receiver/udplogreceiver/udp_test.go @@ -86,7 +86,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub("udplog") require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, testdataConfigYaml(), cfg) diff --git a/receiver/vcenterreceiver/config_test.go b/receiver/vcenterreceiver/config_test.go index 722680d76f43..a6413c4c6df7 100644 --- a/receiver/vcenterreceiver/config_test.go +++ b/receiver/vcenterreceiver/config_test.go @@ -103,7 +103,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) expected := factory.CreateDefaultConfig().(*Config) expected.Endpoint = "http://vcsa.host.localnet" diff --git a/receiver/vcenterreceiver/factory.go b/receiver/vcenterreceiver/factory.go index af634e562966..88cdab91879b 100644 --- a/receiver/vcenterreceiver/factory.go +++ b/receiver/vcenterreceiver/factory.go @@ -42,7 +42,7 @@ func NewFactory() component.ReceiverFactory { ) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -58,7 +58,7 @@ var errConfigNotVcenter = errors.New("config was not an vcenter receiver config" func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - rConf component.ReceiverConfig, + rConf component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { cfg, ok := rConf.(*Config) diff --git a/receiver/vcenterreceiver/go.mod b/receiver/vcenterreceiver/go.mod index 7ae5bb22aa16..25e2783e047d 100644 --- a/receiver/vcenterreceiver/go.mod +++ b/receiver/vcenterreceiver/go.mod @@ -8,10 +8,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/vmware/govmomi v0.29.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -34,7 +34,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/vcenterreceiver/go.sum b/receiver/vcenterreceiver/go.sum index f434312da8fd..383099baa137 100644 --- a/receiver/vcenterreceiver/go.sum +++ b/receiver/vcenterreceiver/go.sum @@ -291,16 +291,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/wavefrontreceiver/config_test.go b/receiver/wavefrontreceiver/config_test.go index e4cc9765de8e..30353a039a8c 100644 --- a/receiver/wavefrontreceiver/config_test.go +++ b/receiver/wavefrontreceiver/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewID(typeStr), @@ -61,7 +61,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/wavefrontreceiver/factory.go b/receiver/wavefrontreceiver/factory.go index 7eedb71a6c1c..22533b1f7950 100644 --- a/receiver/wavefrontreceiver/factory.go +++ b/receiver/wavefrontreceiver/factory.go @@ -44,7 +44,7 @@ func NewFactory() component.ReceiverFactory { component.WithMetricsReceiver(createMetricsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), TCPAddr: confignet.TCPAddr{ @@ -57,7 +57,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index ce6cbfadc324..000ce698da1c 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -9,9 +9,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 google.golang.org/protobuf v1.28.1 ) @@ -30,9 +30,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect - go.opentelemetry.io/collector/semconv v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index e644e7c66089..95e6ac7d206c 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -275,18 +275,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/windowseventlogreceiver/go.mod b/receiver/windowseventlogreceiver/go.mod index 8207f5d389cc..e46e9d15d144 100644 --- a/receiver/windowseventlogreceiver/go.mod +++ b/receiver/windowseventlogreceiver/go.mod @@ -5,9 +5,9 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 golang.org/x/sys v0.2.0 ) @@ -30,8 +30,8 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect - go.opentelemetry.io/collector/pdata v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/windowseventlogreceiver/go.sum b/receiver/windowseventlogreceiver/go.sum index bb2ac4d70a6f..76e4a58bf95a 100644 --- a/receiver/windowseventlogreceiver/go.sum +++ b/receiver/windowseventlogreceiver/go.sum @@ -304,16 +304,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/windowseventlogreceiver/receiver_others.go b/receiver/windowseventlogreceiver/receiver_others.go index 3e5fdd99bd60..2d3d08355103 100644 --- a/receiver/windowseventlogreceiver/receiver_others.go +++ b/receiver/windowseventlogreceiver/receiver_others.go @@ -42,7 +42,7 @@ func NewFactory() component.ReceiverFactory { component.WithLogsReceiver(createLogsReceiver, stability)) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &WindowsLogConfig{ BaseConfig: adapter.BaseConfig{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -54,7 +54,7 @@ func createDefaultConfig() component.ReceiverConfig { func createLogsReceiver( _ context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Logs, ) (component.LogsReceiver, error) { return nil, fmt.Errorf("windows eventlog receiver is only supported on Windows") diff --git a/receiver/windowseventlogreceiver/receiver_windows.go b/receiver/windowseventlogreceiver/receiver_windows.go index 27def60f4b6b..0b579021e519 100644 --- a/receiver/windowseventlogreceiver/receiver_windows.go +++ b/receiver/windowseventlogreceiver/receiver_windows.go @@ -46,7 +46,7 @@ func (f ReceiverType) Type() component.Type { } // CreateDefaultConfig creates a config with type and version -func (f ReceiverType) CreateDefaultConfig() component.ReceiverConfig { +func (f ReceiverType) CreateDefaultConfig() component.Config { return &WindowsLogConfig{ BaseConfig: adapter.BaseConfig{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -57,12 +57,12 @@ func (f ReceiverType) CreateDefaultConfig() component.ReceiverConfig { } // BaseConfig gets the base config from config, for now -func (f ReceiverType) BaseConfig(cfg component.ReceiverConfig) adapter.BaseConfig { +func (f ReceiverType) BaseConfig(cfg component.Config) adapter.BaseConfig { return cfg.(*WindowsLogConfig).BaseConfig } // InputConfig unmarshals the input operator -func (f ReceiverType) InputConfig(cfg component.ReceiverConfig) operator.Config { +func (f ReceiverType) InputConfig(cfg component.Config) operator.Config { return operator.NewConfig(&cfg.(*WindowsLogConfig).InputConfig) } diff --git a/receiver/windowseventlogreceiver/receiver_windows_test.go b/receiver/windowseventlogreceiver/receiver_windows_test.go index a5430542b969..6c31332967af 100644 --- a/receiver/windowseventlogreceiver/receiver_windows_test.go +++ b/receiver/windowseventlogreceiver/receiver_windows_test.go @@ -52,7 +52,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(component.NewIDWithName(typeStr, "").String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, createTestConfig(), cfg) } diff --git a/receiver/windowsperfcountersreceiver/config_test.go b/receiver/windowsperfcountersreceiver/config_test.go index ec32ac77fcd7..3a815ae25840 100644 --- a/receiver/windowsperfcountersreceiver/config_test.go +++ b/receiver/windowsperfcountersreceiver/config_test.go @@ -60,7 +60,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config expectedErr string }{ { @@ -229,7 +229,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) if tt.expectedErr != "" { assert.Equal(t, component.ValidateConfig(cfg).Error(), tt.expectedErr) diff --git a/receiver/windowsperfcountersreceiver/factory.go b/receiver/windowsperfcountersreceiver/factory.go index 6c12787264bc..a961aa1b0e49 100644 --- a/receiver/windowsperfcountersreceiver/factory.go +++ b/receiver/windowsperfcountersreceiver/factory.go @@ -40,7 +40,7 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig creates the default configuration for receiver. -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), diff --git a/receiver/windowsperfcountersreceiver/factory_others.go b/receiver/windowsperfcountersreceiver/factory_others.go index 017c8ce872c4..08fdd11abd74 100644 --- a/receiver/windowsperfcountersreceiver/factory_others.go +++ b/receiver/windowsperfcountersreceiver/factory_others.go @@ -29,7 +29,7 @@ import ( func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { return nil, errors.New("the windows perf counters receiver is only supported on Windows") diff --git a/receiver/windowsperfcountersreceiver/factory_windows.go b/receiver/windowsperfcountersreceiver/factory_windows.go index 4ed73aecb2f6..9519a9ab1f87 100644 --- a/receiver/windowsperfcountersreceiver/factory_windows.go +++ b/receiver/windowsperfcountersreceiver/factory_windows.go @@ -29,7 +29,7 @@ import ( func createMetricsReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { oCfg := cfg.(*Config) diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index 5c77cfe0e443..869850cf988c 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 ) @@ -30,7 +30,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index 9cd52069b80b..2721ce23ca70 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -281,16 +281,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/receiver/zipkinreceiver/config.go b/receiver/zipkinreceiver/config.go index 7a01a7237164..223097dd86ca 100644 --- a/receiver/zipkinreceiver/config.go +++ b/receiver/zipkinreceiver/config.go @@ -30,7 +30,7 @@ type Config struct { ParseStringTags bool `mapstructure:"parse_string_tags"` } -var _ component.ReceiverConfig = (*Config)(nil) +var _ component.Config = (*Config)(nil) // Validate checks the receiver configuration is valid func (cfg *Config) Validate() error { diff --git a/receiver/zipkinreceiver/config_test.go b/receiver/zipkinreceiver/config_test.go index 2105a9fde989..cf526abfb26a 100644 --- a/receiver/zipkinreceiver/config_test.go +++ b/receiver/zipkinreceiver/config_test.go @@ -34,7 +34,7 @@ func TestLoadConfig(t *testing.T) { tests := []struct { id component.ID - expected component.ReceiverConfig + expected component.Config }{ { id: component.NewID(typeStr), @@ -69,7 +69,7 @@ func TestLoadConfig(t *testing.T) { sub, err := cm.Sub(tt.id.String()) require.NoError(t, err) - require.NoError(t, component.UnmarshalReceiverConfig(sub, cfg)) + require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.NoError(t, component.ValidateConfig(cfg)) assert.Equal(t, tt.expected, cfg) diff --git a/receiver/zipkinreceiver/factory.go b/receiver/zipkinreceiver/factory.go index 79cd45ce9e96..88c70031e5bc 100644 --- a/receiver/zipkinreceiver/factory.go +++ b/receiver/zipkinreceiver/factory.go @@ -42,7 +42,7 @@ func NewFactory() component.ReceiverFactory { } // createDefaultConfig creates the default configuration for Zipkin receiver. -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), HTTPServerSettings: confighttp.HTTPServerSettings{ @@ -56,7 +56,7 @@ func createDefaultConfig() component.ReceiverConfig { func createTracesReceiver( _ context.Context, set component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { rCfg := cfg.(*Config) diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index 03201320108f..0156caf50068 100644 --- a/receiver/zipkinreceiver/go.mod +++ b/receiver/zipkinreceiver/go.mod @@ -8,11 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.66.0 github.com/openzipkin/zipkin-go v0.4.1 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 google.golang.org/protobuf v1.28.1 ) @@ -39,7 +39,7 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect diff --git a/receiver/zipkinreceiver/go.sum b/receiver/zipkinreceiver/go.sum index 64080442204f..98863a9510ef 100644 --- a/receiver/zipkinreceiver/go.sum +++ b/receiver/zipkinreceiver/go.sum @@ -296,18 +296,18 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= diff --git a/receiver/zookeeperreceiver/factory.go b/receiver/zookeeperreceiver/factory.go index dc6923b89906..114161d20132 100644 --- a/receiver/zookeeperreceiver/factory.go +++ b/receiver/zookeeperreceiver/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ReceiverFactory { ) } -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), @@ -61,7 +61,7 @@ func createDefaultConfig() component.ReceiverConfig { func createMetricsReceiver( _ context.Context, params component.ReceiverCreateSettings, - config component.ReceiverConfig, + config component.Config, consumer consumer.Metrics, ) (component.MetricsReceiver, error) { rConfig := config.(*Config) diff --git a/receiver/zookeeperreceiver/factory_test.go b/receiver/zookeeperreceiver/factory_test.go index e0345ee3dd65..4e6cf17f65c4 100644 --- a/receiver/zookeeperreceiver/factory_test.go +++ b/receiver/zookeeperreceiver/factory_test.go @@ -41,7 +41,7 @@ func TestFactory(t *testing.T) { tests := []struct { name string - config component.ReceiverConfig + config component.Config wantErr bool }{ { diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index e615e6365b56..5dd95a5ac147 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -7,10 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -52,7 +52,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/sirupsen/logrus v1.8.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/receiver/zookeeperreceiver/go.sum b/receiver/zookeeperreceiver/go.sum index cee5f7f98661..aeed8158055d 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -821,16 +821,16 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60= diff --git a/testbed/go.mod b/testbed/go.mod index a242d2f91521..57a1895d792d 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -27,19 +27,19 @@ require ( github.com/prometheus/prometheus v0.38.0 github.com/shirou/gopsutil/v3 v3.22.10 github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/exporter/loggingexporter v0.66.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.0 - go.opentelemetry.io/collector/extension/ballastextension v0.66.0 - go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0 - go.opentelemetry.io/collector/semconv v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/atomic v1.10.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 @@ -192,7 +192,7 @@ require ( github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect diff --git a/testbed/go.sum b/testbed/go.sum index f69f7cb89ac7..109272c1bf91 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -1637,50 +1637,50 @@ go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= go.opentelemetry.io/collector v0.64.1/go.mod h1:RxdEKzwxTEhBAgzC4wzyJEwSFgjWU73CHnLjKUKQDyo= go.opentelemetry.io/collector v0.65.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= go.opentelemetry.io/collector/component v0.65.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= go.opentelemetry.io/collector/consumer v0.65.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.0 h1:LLgWAS3zGce/H7UVB/EwPm49n3qNRbh/Gkd1IPORJDg= -go.opentelemetry.io/collector/exporter/loggingexporter v0.66.0/go.mod h1:X7fNHTbcgvOOio9QDEyVk0WbIm1JaVYby4z3VzsOc2k= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0 h1:uXNkGlAXHyvUZL51qsQR8hS8oSt80m1ncbqwXRRkJMk= -go.opentelemetry.io/collector/exporter/otlpexporter v0.66.0/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.0 h1:Nqopv2VdkjI/kCg8SsZYBD5R+Gd3OlM5lAZ2N+Exx60= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.0/go.mod h1:Gx9WIGE9pUv38Sm8IN0IPM7k+mX2hHGfRZI/65pOSIc= -go.opentelemetry.io/collector/extension/ballastextension v0.66.0 h1:oAEb4UBwNs5v9X83farWSVnxmjSiU5eHmWCU6agSVRE= -go.opentelemetry.io/collector/extension/ballastextension v0.66.0/go.mod h1:vjBno34PZB+byrW3QWzftLFqCI1G8PbgPrgPzpFXpQM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:kCxEnurhKpScV+wDU/7RDngmOFeqyEh7GZUqrBaYnUU= +go.opentelemetry.io/collector/exporter/loggingexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:X7fNHTbcgvOOio9QDEyVk0WbIm1JaVYby4z3VzsOc2k= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:3+YgPEDEyNzwiI+V9J2YBVGyV9Qppu4VPbB3jHeN8Ns= +go.opentelemetry.io/collector/exporter/otlpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:IOoHR1lsV1r2TFOVctPogn9RUXT4jiU7kH+IhfUlP1w= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90 h1:KkI/to7/yvuL5zHzhviy7UXMZVZ7jbfnk+YCAwCiimA= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:Gx9WIGE9pUv38Sm8IN0IPM7k+mX2hHGfRZI/65pOSIc= +go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90 h1:JmfSDExgWNiFQJ4eF9UzjDaE9rfBhKxIu5khBbAScd0= +go.opentelemetry.io/collector/extension/ballastextension v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:vjBno34PZB+byrW3QWzftLFqCI1G8PbgPrgPzpFXpQM= go.opentelemetry.io/collector/extension/zpagesextension v0.64.1/go.mod h1:XenhQAUbOHgqNq5YQ/vQIcDHRcPUaDgZQxDC2qoI4Bc= go.opentelemetry.io/collector/extension/zpagesextension v0.65.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0 h1:tPqSKH5K3VhTT0XXVoWL3woWBSTJqnXZQRt0ZLSCoCc= -go.opentelemetry.io/collector/extension/zpagesextension v0.66.0/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90 h1:Hsvd2zNTCjHjYVsHt57zUgpKMrmESgndZItuuvvv2bA= +go.opentelemetry.io/collector/extension/zpagesextension v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:+IPas7AeffG0GMIXhZr8IzpTNhH1Ri/6S/9YFqbLsmQ= go.opentelemetry.io/collector/featuregate v0.65.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= go.opentelemetry.io/collector/pdata v0.56.0/go.mod h1:mYcCREWiIJyHss0dbU+GSiz2tmGZ6u09vtfkKTciog4= go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= go.opentelemetry.io/collector/pdata v0.64.1/go.mod h1:IzvXUGQml2mrnvdb8zIlEW3qQs9oFLdD2hLwJdZ+pek= go.opentelemetry.io/collector/pdata v0.65.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/collector/processor/batchprocessor v0.64.1/go.mod h1:qVl0+aYokPfiq5y+JVAvlII2rrUFBDEqqiDbTSnax78= go.opentelemetry.io/collector/processor/batchprocessor v0.65.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0 h1:3GNIEOmGiVUSWljlisFGmjvIfsVKhn0OCafirS53YAs= -go.opentelemetry.io/collector/processor/batchprocessor v0.66.0/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.0 h1:JLzuWcVrRGFyLUaE9u42ZdLNXNUpbLnEQg3w0ULeQG8= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.0/go.mod h1:KfHfOzND4tzQYewrYzi/NGzvOV3wR7jzWTkxSR00lRI= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:K12L9juzjChBMfp7cQaQsToz7i7975tUYVzJ3Tpw/Cw= +go.opentelemetry.io/collector/processor/batchprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:XhGTsC1B/bq4gpg8IZ/QYBLXkzE4Gw3r7Xu2+ik8A1Q= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90 h1:4+4M7itvIDswjFTjvVttC+XWy7eOU2lxjEBaUiq/MXk= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:KfHfOzND4tzQYewrYzi/NGzvOV3wR7jzWTkxSR00lRI= go.opentelemetry.io/collector/receiver/otlpreceiver v0.64.1/go.mod h1:4rwNi9SeCKBP9XGLWNRFKPsWUV5NK4iqMvdj2WRMksQ= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0 h1:ZHEOeGOIYIDTKhI9xs30/obFfhUbb9b2+e/eahp1fJA= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.0/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90 h1:/+HfaoVPSXgHUZOTZSSriuKOQi8L/rgyb7TTRx5jzoo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pb+dcV+KJ44dP+CqV0N6L6dTeDDvCXB8StCqwlrrSkM= go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= go.opentelemetry.io/collector/semconv v0.64.1/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/collector/semconv v0.65.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= -go.opentelemetry.io/collector/semconv v0.66.0 h1:gz4fYzOVOt1EQCcOL6pbSmTRj93pZErjHD+H100pH+4= -go.opentelemetry.io/collector/semconv v0.66.0/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90 h1:hFaTA68cggZKWMv7wQ3bKP8KGTbowh/5AQZKCHzHTqM= +go.opentelemetry.io/collector/semconv v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:5o9yhOa+ABt7g2E5JABDxGZ1PQPbtfxrKNbYn+LOTXU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.33.0/go.mod h1:y/SlJpJQPd2UzfBCj0E9Flk9FDCtTyqUmaCB41qFrWI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 h1:PRXhsszxTt5bbPriTjmaweWUsAnJYeWBhUMLRetUgBU= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4/go.mod h1:05eWWy6ZWzmpeImD3UowLTB3VjDMU1yxQ+ENuVWDM3c= diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go b/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go index 67d23fe74ee1..272ed5de4b9b 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go @@ -43,7 +43,7 @@ func NewFactory() component.ReceiverFactory { } // CreateDefaultConfig creates the default configuration for Jaeger receiver. -func createDefaultConfig() component.ReceiverConfig { +func createDefaultConfig() component.Config { return &Config{ ReceiverSettings: config.NewReceiverSettings(component.NewID(typeStr)), Endpoint: defaultEndpoint, @@ -54,7 +54,7 @@ func createDefaultConfig() component.ReceiverConfig { func createTracesReceiver( ctx context.Context, params component.ReceiverCreateSettings, - cfg component.ReceiverConfig, + cfg component.Config, nextConsumer consumer.Traces, ) (component.TracesReceiver, error) { rCfg := cfg.(*Config) diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod index 2dab317fc672..877f53c67f3e 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod @@ -4,10 +4,10 @@ go 1.18 require ( github.com/gorilla/mux v1.8.0 - go.opentelemetry.io/collector v0.66.0 - go.opentelemetry.io/collector/component v0.66.0 - go.opentelemetry.io/collector/consumer v0.66.0 - go.opentelemetry.io/collector/pdata v0.66.0 + go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 + go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 go.uber.org/zap v1.23.0 ) @@ -24,7 +24,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/featuregate v0.66.0 // indirect + go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 // indirect go.opentelemetry.io/otel v1.11.1 // indirect go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/otel/trace v1.11.1 // indirect diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum index 40882e843264..d29a2382a180 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum @@ -278,16 +278,16 @@ go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3 go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.66.0 h1:5+0N2PCyqHoE3MYV8tgCsyeD86KbmIVDKmqKF9A7u9k= -go.opentelemetry.io/collector v0.66.0/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= -go.opentelemetry.io/collector/component v0.66.0 h1:M2kI+BXGilmqEs8Kufo5nu0xiO+5cvwdPflV/r4pGkE= -go.opentelemetry.io/collector/component v0.66.0/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= -go.opentelemetry.io/collector/consumer v0.66.0 h1:wDx0MmqqsHGBcEa24HS0MlvDbLR0jT/936CSZ7vvP4M= -go.opentelemetry.io/collector/consumer v0.66.0/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= -go.opentelemetry.io/collector/featuregate v0.66.0 h1:WW3IYWxOu9cfXa6fQwov0jswlf2Y/NEBHgiDkRPm4Uw= -go.opentelemetry.io/collector/featuregate v0.66.0/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= -go.opentelemetry.io/collector/pdata v0.66.0 h1:UdE5U6MsDNzuiWaXdjGx2lC3ElVqWmN/hiUE8vyvSuM= -go.opentelemetry.io/collector/pdata v0.66.0/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90 h1:yRe05/jMdzH4TFHfndZ5h2o2hKBK/79W72j8w51qNsI= +go.opentelemetry.io/collector v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:hE6jCs+0rfiufCrVPucKZTMwfHit1okfDPnwPT2eW1I= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90 h1:AYSNTXbezhNg43EuYdVVcgxE/2gBVrm00FDx4DOmQVg= +go.opentelemetry.io/collector/component v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:0c84EqXUhvYe6KW7hJfh76tiI/5yjWCH2amwyQ06XLM= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90 h1:nzNXVfC1FzXBXCLMzbMv+qK3E4EGiNsnMhfVsBd2yzc= +go.opentelemetry.io/collector/consumer v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:WtoRZa5SnxQO1ZEQdVxYpFcXCmq62rakv0oUSlPO0NQ= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90 h1:UuJSFWbi9XxyNZsJKZuvpWg35BgRbcCGFH+38V2MAdw= +go.opentelemetry.io/collector/featuregate v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:tewuFKJYalWBU0bmNKg++MC1ipINXUr6szYzOw2p1GI= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90 h1:Vu4S4jSNcd0VFPzxQNO4+UqGwnes1xJDoFLPRiWHm8I= +go.opentelemetry.io/collector/pdata v0.66.1-0.20221128222955-4ff1ff379b90/go.mod h1:pqyaznLzk21m+1KL6fwOsRryRELL+zNM0qiVSn0MbVc= go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= go.opentelemetry.io/otel/exporters/prometheus v0.33.0 h1:xXhPj7SLKWU5/Zd4Hxmd+X1C4jdmvc0Xy+kvjFx2z60=