From f7bbe745602867d84ca363cd21b747b2eece38b0 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Wed, 23 Feb 2022 10:06:07 -0800 Subject: [PATCH] Upgrade deps, fix calls to deprecated funcs (#8104) Signed-off-by: Bogdan Drutu --- Makefile | 3 +-- Makefile.Common | 5 +++++ cmd/configschema/go.mod | 2 +- cmd/configschema/go.sum | 4 ++-- cmd/mdatagen/go.mod | 2 +- cmd/mdatagen/go.sum | 4 ++-- exporter/alibabacloudlogserviceexporter/factory.go | 9 ++++----- exporter/alibabacloudlogserviceexporter/go.mod | 2 +- exporter/alibabacloudlogserviceexporter/go.sum | 4 ++-- exporter/awscloudwatchlogsexporter/factory.go | 4 ++-- exporter/awscloudwatchlogsexporter/go.mod | 2 +- exporter/awscloudwatchlogsexporter/go.sum | 4 ++-- exporter/awsemfexporter/factory.go | 5 ++--- exporter/awsemfexporter/go.mod | 2 +- exporter/awsemfexporter/go.sum | 4 ++-- exporter/awskinesisexporter/factory.go | 8 ++++---- exporter/awskinesisexporter/go.mod | 2 +- exporter/awskinesisexporter/go.sum | 4 ++-- exporter/awsprometheusremotewriteexporter/go.mod | 2 +- exporter/awsprometheusremotewriteexporter/go.sum | 4 ++-- exporter/awsxrayexporter/factory.go | 5 ++--- exporter/awsxrayexporter/go.mod | 2 +- exporter/awsxrayexporter/go.sum | 4 ++-- exporter/azuremonitorexporter/factory.go | 7 +++---- exporter/azuremonitorexporter/go.mod | 2 +- exporter/azuremonitorexporter/go.sum | 4 ++-- exporter/carbonexporter/factory.go | 5 ++--- exporter/carbonexporter/go.mod | 2 +- exporter/carbonexporter/go.sum | 4 ++-- exporter/clickhouseexporter/factory.go | 4 ++-- exporter/clickhouseexporter/go.mod | 2 +- exporter/clickhouseexporter/go.sum | 4 ++-- exporter/coralogixexporter/factory.go | 4 ++-- exporter/coralogixexporter/go.mod | 2 +- exporter/coralogixexporter/go.sum | 4 ++-- exporter/datadogexporter/factory.go | 6 +++--- exporter/datadogexporter/go.mod | 2 +- exporter/datadogexporter/go.sum | 4 ++-- exporter/dynatraceexporter/factory.go | 4 ++-- exporter/dynatraceexporter/go.mod | 2 +- exporter/dynatraceexporter/go.sum | 4 ++-- exporter/elasticexporter/factory.go | 7 +++---- exporter/elasticexporter/go.mod | 2 +- exporter/elasticexporter/go.sum | 4 ++-- exporter/elasticsearchexporter/factory.go | 4 ++-- exporter/elasticsearchexporter/go.mod | 2 +- exporter/elasticsearchexporter/go.sum | 4 ++-- exporter/f5cloudexporter/go.mod | 2 +- exporter/f5cloudexporter/go.sum | 4 ++-- exporter/fileexporter/factory.go | 8 ++++---- exporter/fileexporter/go.mod | 2 +- exporter/fileexporter/go.sum | 4 ++-- exporter/googlecloudexporter/factory.go | 6 +++--- exporter/googlecloudexporter/go.mod | 2 +- exporter/googlecloudexporter/go.sum | 4 ++-- exporter/googlecloudpubsubexporter/factory.go | 8 ++++---- exporter/googlecloudpubsubexporter/go.mod | 2 +- exporter/googlecloudpubsubexporter/go.sum | 4 ++-- exporter/honeycombexporter/factory.go | 4 ++-- exporter/honeycombexporter/go.mod | 2 +- exporter/honeycombexporter/go.sum | 4 ++-- exporter/humioexporter/factory.go | 4 ++-- exporter/humioexporter/go.mod | 2 +- exporter/humioexporter/go.sum | 4 ++-- exporter/influxdbexporter/factory.go | 8 ++++---- exporter/influxdbexporter/go.mod | 2 +- exporter/influxdbexporter/go.sum | 4 ++-- exporter/jaegerexporter/factory.go | 4 ++-- exporter/jaegerexporter/go.mod | 2 +- exporter/jaegerexporter/go.sum | 4 ++-- exporter/jaegerthrifthttpexporter/factory.go | 4 ++-- exporter/jaegerthrifthttpexporter/go.mod | 2 +- exporter/jaegerthrifthttpexporter/go.sum | 4 ++-- exporter/kafkaexporter/factory.go | 8 ++++---- exporter/kafkaexporter/go.mod | 2 +- exporter/kafkaexporter/go.sum | 4 ++-- exporter/loadbalancingexporter/factory.go | 7 +++---- exporter/loadbalancingexporter/go.mod | 2 +- exporter/loadbalancingexporter/go.sum | 4 ++-- exporter/loadbalancingexporter/loadbalancer_test.go | 9 ++++----- exporter/logzioexporter/factory.go | 5 ++--- exporter/logzioexporter/go.mod | 2 +- exporter/logzioexporter/go.sum | 4 ++-- exporter/lokiexporter/factory.go | 4 ++-- exporter/lokiexporter/go.mod | 2 +- exporter/lokiexporter/go.sum | 4 ++-- exporter/newrelicexporter/factory.go | 8 ++++---- exporter/newrelicexporter/go.mod | 2 +- exporter/newrelicexporter/go.sum | 4 ++-- exporter/observiqexporter/factory.go | 4 ++-- exporter/observiqexporter/go.mod | 2 +- exporter/observiqexporter/go.sum | 4 ++-- exporter/opencensusexporter/factory.go | 6 +++--- exporter/opencensusexporter/go.mod | 2 +- exporter/opencensusexporter/go.sum | 4 ++-- exporter/parquetexporter/factory.go | 8 ++++---- exporter/parquetexporter/go.mod | 2 +- exporter/parquetexporter/go.sum | 4 ++-- exporter/prometheusexporter/factory.go | 4 ++-- exporter/prometheusexporter/go.mod | 2 +- exporter/prometheusexporter/go.sum | 4 ++-- exporter/prometheusremotewriteexporter/factory.go | 4 ++-- exporter/prometheusremotewriteexporter/go.mod | 2 +- exporter/prometheusremotewriteexporter/go.sum | 4 ++-- exporter/sapmexporter/factory.go | 4 ++-- exporter/sapmexporter/go.mod | 2 +- exporter/sapmexporter/go.sum | 4 ++-- exporter/sentryexporter/factory.go | 5 ++--- exporter/sentryexporter/go.mod | 2 +- exporter/sentryexporter/go.sum | 4 ++-- exporter/signalfxexporter/factory.go | 8 ++++---- exporter/signalfxexporter/go.mod | 2 +- exporter/signalfxexporter/go.sum | 4 ++-- exporter/skywalkingexporter/factory.go | 6 +++--- exporter/skywalkingexporter/go.mod | 2 +- exporter/skywalkingexporter/go.sum | 4 ++-- exporter/splunkhecexporter/factory.go | 8 ++++---- exporter/splunkhecexporter/go.mod | 2 +- exporter/splunkhecexporter/go.sum | 4 ++-- exporter/stackdriverexporter/go.mod | 2 +- exporter/stackdriverexporter/go.sum | 4 ++-- exporter/sumologicexporter/factory.go | 6 +++--- exporter/sumologicexporter/go.mod | 2 +- exporter/sumologicexporter/go.sum | 4 ++-- exporter/tanzuobservabilityexporter/factory.go | 6 +++--- exporter/tanzuobservabilityexporter/go.mod | 2 +- exporter/tanzuobservabilityexporter/go.sum | 4 ++-- exporter/tencentcloudlogserviceexporter/factory.go | 5 ++--- exporter/tencentcloudlogserviceexporter/go.mod | 2 +- exporter/tencentcloudlogserviceexporter/go.sum | 4 ++-- exporter/zipkinexporter/factory.go | 4 ++-- exporter/zipkinexporter/go.mod | 2 +- exporter/zipkinexporter/go.sum | 4 ++-- extension/asapauthextension/go.mod | 2 +- extension/asapauthextension/go.sum | 4 ++-- extension/awsproxy/go.mod | 2 +- extension/awsproxy/go.sum | 4 ++-- extension/basicauthextension/go.mod | 2 +- extension/basicauthextension/go.sum | 4 ++-- extension/bearertokenauthextension/go.mod | 2 +- extension/bearertokenauthextension/go.sum | 4 ++-- extension/fluentbitextension/go.mod | 2 +- extension/fluentbitextension/go.sum | 4 ++-- extension/healthcheckextension/go.mod | 2 +- extension/healthcheckextension/go.sum | 4 ++-- extension/httpforwarder/go.mod | 2 +- extension/httpforwarder/go.sum | 4 ++-- extension/jaegerremotesampling/go.mod | 2 +- extension/jaegerremotesampling/go.sum | 4 ++-- extension/oauth2clientauthextension/go.mod | 2 +- extension/oauth2clientauthextension/go.sum | 4 ++-- extension/observer/dockerobserver/go.mod | 2 +- extension/observer/dockerobserver/go.sum | 4 ++-- extension/observer/ecsobserver/go.mod | 2 +- extension/observer/ecsobserver/go.sum | 4 ++-- extension/observer/ecstaskobserver/go.mod | 2 +- extension/observer/ecstaskobserver/go.sum | 4 ++-- extension/observer/hostobserver/go.mod | 2 +- extension/observer/hostobserver/go.sum | 4 ++-- extension/observer/k8sobserver/go.mod | 2 +- extension/observer/k8sobserver/go.sum | 4 ++-- extension/oidcauthextension/go.mod | 2 +- extension/oidcauthextension/go.sum | 4 ++-- extension/pprofextension/go.mod | 2 +- extension/pprofextension/go.sum | 4 ++-- extension/storage/go.mod | 2 +- extension/storage/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- internal/aws/cwlogs/go.mod | 2 +- internal/aws/cwlogs/go.sum | 4 ++-- internal/aws/ecsutil/go.mod | 2 +- internal/aws/ecsutil/go.sum | 4 ++-- internal/aws/proxy/go.mod | 2 +- internal/aws/proxy/go.sum | 4 ++-- internal/coreinternal/go.mod | 2 +- internal/coreinternal/go.sum | 4 ++-- internal/kubelet/go.mod | 2 +- internal/kubelet/go.sum | 4 ++-- internal/sharedcomponent/go.mod | 2 +- internal/sharedcomponent/go.sum | 4 ++-- internal/splunk/go.mod | 2 +- internal/splunk/go.sum | 4 ++-- internal/stanza/factory.go | 7 +++---- internal/stanza/go.mod | 2 +- internal/stanza/go.sum | 4 ++-- pkg/batchperresourceattr/go.mod | 2 +- pkg/batchperresourceattr/go.sum | 4 ++-- pkg/resourcetotelemetry/go.mod | 2 +- pkg/resourcetotelemetry/go.sum | 4 ++-- pkg/translator/prometheusremotewrite/go.mod | 2 +- pkg/translator/prometheusremotewrite/go.sum | 4 ++-- processor/attributesprocessor/factory.go | 6 +++--- processor/attributesprocessor/go.mod | 2 +- processor/attributesprocessor/go.sum | 4 ++-- processor/cumulativetodeltaprocessor/factory.go | 4 ++-- processor/cumulativetodeltaprocessor/go.mod | 2 +- processor/cumulativetodeltaprocessor/go.sum | 4 ++-- processor/deltatorateprocessor/factory.go | 4 ++-- processor/deltatorateprocessor/go.mod | 2 +- processor/deltatorateprocessor/go.sum | 4 ++-- processor/filterprocessor/factory.go | 6 +++--- processor/filterprocessor/go.mod | 2 +- processor/filterprocessor/go.sum | 4 ++-- processor/groupbyattrsprocessor/factory.go | 8 ++++---- processor/groupbyattrsprocessor/go.mod | 2 +- processor/groupbyattrsprocessor/go.sum | 4 ++-- processor/groupbytraceprocessor/factory.go | 5 ++--- processor/groupbytraceprocessor/go.mod | 2 +- processor/groupbytraceprocessor/go.sum | 4 ++-- processor/k8sattributesprocessor/factory.go | 8 ++++---- processor/k8sattributesprocessor/go.mod | 2 +- processor/k8sattributesprocessor/go.sum | 4 ++-- processor/metricsgenerationprocessor/factory.go | 4 ++-- processor/metricsgenerationprocessor/go.mod | 2 +- processor/metricsgenerationprocessor/go.sum | 4 ++-- processor/metricstransformprocessor/factory.go | 4 ++-- processor/metricstransformprocessor/go.mod | 2 +- processor/metricstransformprocessor/go.sum | 4 ++-- processor/probabilisticsamplerprocessor/factory.go | 5 ++--- processor/probabilisticsamplerprocessor/go.mod | 2 +- processor/probabilisticsamplerprocessor/go.sum | 4 ++-- processor/redactionprocessor/factory.go | 4 ++-- processor/redactionprocessor/go.mod | 2 +- processor/redactionprocessor/go.sum | 4 ++-- processor/resourcedetectionprocessor/factory.go | 8 ++++---- processor/resourcedetectionprocessor/go.mod | 2 +- processor/resourcedetectionprocessor/go.sum | 4 ++-- processor/resourceprocessor/factory.go | 8 ++++---- processor/resourceprocessor/go.mod | 2 +- processor/resourceprocessor/go.sum | 4 ++-- processor/routingprocessor/factory.go | 9 ++++----- processor/routingprocessor/go.mod | 2 +- processor/routingprocessor/go.sum | 4 ++-- processor/spanmetricsprocessor/factory.go | 5 ++--- processor/spanmetricsprocessor/go.mod | 2 +- processor/spanmetricsprocessor/go.sum | 4 ++-- processor/spanprocessor/factory.go | 4 ++-- processor/spanprocessor/go.mod | 2 +- processor/spanprocessor/go.sum | 4 ++-- processor/tailsamplingprocessor/factory.go | 5 ++--- processor/tailsamplingprocessor/go.mod | 2 +- processor/tailsamplingprocessor/go.sum | 4 ++-- processor/transformprocessor/factory.go | 4 ++-- processor/transformprocessor/go.mod | 2 +- processor/transformprocessor/go.sum | 4 ++-- receiver/apachereceiver/factory.go | 5 ++--- receiver/apachereceiver/go.mod | 2 +- receiver/apachereceiver/go.sum | 4 ++-- receiver/awscontainerinsightreceiver/factory.go | 5 ++--- receiver/awscontainerinsightreceiver/go.mod | 2 +- receiver/awscontainerinsightreceiver/go.sum | 4 ++-- receiver/awsecscontainermetricsreceiver/factory.go | 5 ++--- receiver/awsecscontainermetricsreceiver/go.mod | 2 +- receiver/awsecscontainermetricsreceiver/go.sum | 4 ++-- receiver/awsfirehosereceiver/factory.go | 5 ++--- receiver/awsfirehosereceiver/go.mod | 2 +- receiver/awsfirehosereceiver/go.sum | 4 ++-- receiver/awsxrayreceiver/factory.go | 5 ++--- receiver/awsxrayreceiver/go.mod | 2 +- receiver/awsxrayreceiver/go.sum | 4 ++-- receiver/carbonreceiver/factory.go | 5 ++--- receiver/carbonreceiver/go.mod | 2 +- receiver/carbonreceiver/go.sum | 4 ++-- receiver/cloudfoundryreceiver/factory.go | 5 ++--- receiver/cloudfoundryreceiver/go.mod | 2 +- receiver/cloudfoundryreceiver/go.sum | 4 ++-- receiver/collectdreceiver/factory.go | 5 ++--- receiver/collectdreceiver/go.mod | 2 +- receiver/collectdreceiver/go.sum | 4 ++-- receiver/couchbasereceiver/factory.go | 5 ++--- receiver/couchbasereceiver/go.mod | 2 +- receiver/couchbasereceiver/go.sum | 4 ++-- receiver/couchdbreceiver/factory.go | 5 ++--- receiver/couchdbreceiver/go.mod | 2 +- receiver/couchdbreceiver/go.sum | 4 ++-- receiver/dockerstatsreceiver/factory.go | 5 ++--- receiver/dockerstatsreceiver/go.mod | 2 +- receiver/dockerstatsreceiver/go.sum | 4 ++-- receiver/dotnetdiagnosticsreceiver/factory.go | 5 ++--- receiver/dotnetdiagnosticsreceiver/go.mod | 2 +- receiver/dotnetdiagnosticsreceiver/go.sum | 4 ++-- receiver/elasticsearchreceiver/factory.go | 5 ++--- receiver/elasticsearchreceiver/go.mod | 2 +- receiver/elasticsearchreceiver/go.sum | 4 ++-- receiver/filelogreceiver/go.mod | 2 +- receiver/filelogreceiver/go.sum | 4 ++-- receiver/fluentforwardreceiver/factory.go | 5 ++--- receiver/fluentforwardreceiver/go.mod | 2 +- receiver/fluentforwardreceiver/go.sum | 4 ++-- receiver/googlecloudpubsubreceiver/factory.go | 9 ++++----- receiver/googlecloudpubsubreceiver/go.mod | 2 +- receiver/googlecloudpubsubreceiver/go.sum | 4 ++-- receiver/googlecloudspannerreceiver/factory.go | 5 ++--- receiver/googlecloudspannerreceiver/go.mod | 2 +- receiver/googlecloudspannerreceiver/go.sum | 4 ++-- receiver/hostmetricsreceiver/factory.go | 5 ++--- receiver/hostmetricsreceiver/go.mod | 2 +- receiver/hostmetricsreceiver/go.sum | 4 ++-- receiver/influxdbreceiver/factory.go | 5 ++--- receiver/influxdbreceiver/go.mod | 2 +- receiver/influxdbreceiver/go.sum | 4 ++-- receiver/jaegerreceiver/factory.go | 5 ++--- receiver/jaegerreceiver/go.mod | 2 +- receiver/jaegerreceiver/go.sum | 4 ++-- receiver/jmxreceiver/factory.go | 5 ++--- receiver/jmxreceiver/go.mod | 2 +- receiver/jmxreceiver/go.sum | 4 ++-- receiver/journaldreceiver/go.mod | 2 +- receiver/journaldreceiver/go.sum | 4 ++-- receiver/journaldreceiver/journald_nonlinux.go | 5 ++--- receiver/k8sclusterreceiver/factory.go | 5 ++--- receiver/k8sclusterreceiver/go.mod | 2 +- receiver/k8sclusterreceiver/go.sum | 4 ++-- receiver/k8seventsreceiver/factory.go | 5 ++--- receiver/k8seventsreceiver/go.mod | 2 +- receiver/k8seventsreceiver/go.sum | 4 ++-- receiver/kafkametricsreceiver/factory.go | 5 ++--- receiver/kafkametricsreceiver/go.mod | 2 +- receiver/kafkametricsreceiver/go.sum | 4 ++-- receiver/kafkareceiver/factory.go | 9 ++++----- receiver/kafkareceiver/go.mod | 2 +- receiver/kafkareceiver/go.sum | 4 ++-- receiver/kubeletstatsreceiver/factory.go | 5 ++--- receiver/kubeletstatsreceiver/go.mod | 2 +- receiver/kubeletstatsreceiver/go.sum | 4 ++-- receiver/memcachedreceiver/factory.go | 5 ++--- receiver/memcachedreceiver/go.mod | 2 +- receiver/memcachedreceiver/go.sum | 4 ++-- receiver/mongodbatlasreceiver/factory.go | 5 ++--- receiver/mongodbatlasreceiver/go.mod | 2 +- receiver/mongodbatlasreceiver/go.sum | 4 ++-- receiver/mongodbreceiver/factory.go | 5 ++--- receiver/mongodbreceiver/go.mod | 2 +- receiver/mongodbreceiver/go.sum | 4 ++-- receiver/mysqlreceiver/factory.go | 5 ++--- receiver/mysqlreceiver/go.mod | 2 +- receiver/mysqlreceiver/go.sum | 4 ++-- receiver/nginxreceiver/factory.go | 5 ++--- receiver/nginxreceiver/go.mod | 2 +- receiver/nginxreceiver/go.sum | 4 ++-- receiver/opencensusreceiver/factory.go | 7 +++---- receiver/opencensusreceiver/go.mod | 2 +- receiver/opencensusreceiver/go.sum | 4 ++-- receiver/podmanreceiver/factory.go | 5 ++--- receiver/podmanreceiver/go.mod | 2 +- receiver/podmanreceiver/go.sum | 4 ++-- receiver/postgresqlreceiver/factory.go | 5 ++--- receiver/postgresqlreceiver/go.mod | 2 +- receiver/postgresqlreceiver/go.sum | 4 ++-- receiver/prometheusexecreceiver/factory.go | 5 ++--- receiver/prometheusexecreceiver/go.mod | 2 +- receiver/prometheusexecreceiver/go.sum | 4 ++-- receiver/prometheusreceiver/factory.go | 5 ++--- receiver/prometheusreceiver/go.mod | 2 +- receiver/prometheusreceiver/go.sum | 4 ++-- receiver/rabbitmqreceiver/factory.go | 5 ++--- receiver/rabbitmqreceiver/go.mod | 2 +- receiver/rabbitmqreceiver/go.sum | 4 ++-- receiver/receivercreator/factory.go | 5 ++--- receiver/receivercreator/go.mod | 2 +- receiver/receivercreator/go.sum | 4 ++-- receiver/redisreceiver/factory.go | 5 ++--- receiver/redisreceiver/go.mod | 2 +- receiver/redisreceiver/go.sum | 4 ++-- receiver/sapmreceiver/factory.go | 5 ++--- receiver/sapmreceiver/go.mod | 2 +- receiver/sapmreceiver/go.sum | 4 ++-- receiver/signalfxreceiver/factory.go | 7 +++---- receiver/signalfxreceiver/go.mod | 2 +- receiver/signalfxreceiver/go.sum | 4 ++-- receiver/simpleprometheusreceiver/factory.go | 5 ++--- receiver/simpleprometheusreceiver/go.mod | 2 +- receiver/simpleprometheusreceiver/go.sum | 4 ++-- receiver/splunkhecreceiver/factory.go | 7 +++---- receiver/splunkhecreceiver/go.mod | 2 +- receiver/splunkhecreceiver/go.sum | 4 ++-- receiver/statsdreceiver/factory.go | 5 ++--- receiver/statsdreceiver/go.mod | 2 +- receiver/statsdreceiver/go.sum | 4 ++-- receiver/syslogreceiver/go.mod | 2 +- receiver/syslogreceiver/go.sum | 4 ++-- receiver/tcplogreceiver/go.mod | 2 +- receiver/tcplogreceiver/go.sum | 4 ++-- receiver/udplogreceiver/go.mod | 2 +- receiver/udplogreceiver/go.sum | 4 ++-- receiver/wavefrontreceiver/factory.go | 5 ++--- receiver/wavefrontreceiver/go.mod | 2 +- receiver/wavefrontreceiver/go.sum | 4 ++-- receiver/windowsperfcountersreceiver/factory.go | 5 ++--- receiver/windowsperfcountersreceiver/go.mod | 2 +- receiver/windowsperfcountersreceiver/go.sum | 4 ++-- receiver/zipkinreceiver/factory.go | 5 ++--- receiver/zipkinreceiver/go.mod | 2 +- receiver/zipkinreceiver/go.sum | 4 ++-- receiver/zookeeperreceiver/factory.go | 5 ++--- receiver/zookeeperreceiver/go.mod | 2 +- receiver/zookeeperreceiver/go.sum | 4 ++-- testbed/go.mod | 2 +- testbed/go.sum | 4 ++-- testbed/mockdatareceivers/mockawsxrayreceiver/factory.go | 5 ++--- testbed/mockdatareceivers/mockawsxrayreceiver/go.mod | 2 +- testbed/mockdatareceivers/mockawsxrayreceiver/go.sum | 4 ++-- 403 files changed, 713 insertions(+), 775 deletions(-) diff --git a/Makefile b/Makefile index 773504a053ed..a4c71eca58e5 100644 --- a/Makefile +++ b/Makefile @@ -233,8 +233,7 @@ otelcontribcol-windows_amd64: .PHONY: update-dep update-dep: - $(MAKE) for-all CMD="$(PWD)/internal/buildscripts/update-dep" - $(MAKE) -j2 gotidy + $(MAKE) for-all-target TARGET="updatedep" $(MAKE) otelcontribcol .PHONY: update-otel diff --git a/Makefile.Common b/Makefile.Common index 9c4ef5d06f14..65888ea116f9 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -116,3 +116,8 @@ impi: .PHONY: moddownload moddownload: $(GOCMD) mod download + +.PHONY: updatedep +updatedep: + $(PWD)/internal/buildscripts/update-dep + @$(MAKE) tidy diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index edaa8231a3f1..8813a5fbe7a1 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 golang.org/x/mod v0.5.1 diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index 2a6d7793cca2..e6166d7385d1 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -2149,8 +2149,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.39.0/go.mod h1:gS8A27wi+8gM3hrXL+dEjTbrbLxktjHjAwwqI31ELgQ= go.opentelemetry.io/collector/model v0.44.0/go.mod h1:4jo1R8uBDspLCxUGhQ0k3v/EFXFbW7s0AIy3LuGLbcU= go.opentelemetry.io/collector/model v0.45.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index fd349ab40eda..baeb4941ae4f 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -7,7 +7,7 @@ require ( github.com/go-playground/universal-translator v0.18.0 github.com/go-playground/validator/v10 v10.10.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a ) diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index e7b72ffed91f..ad58a9fe5a34 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -137,8 +137,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/exporter/alibabacloudlogserviceexporter/factory.go b/exporter/alibabacloudlogserviceexporter/factory.go index 5e5cb55039fb..04834a2319c5 100644 --- a/exporter/alibabacloudlogserviceexporter/factory.go +++ b/exporter/alibabacloudlogserviceexporter/factory.go @@ -19,7 +19,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/exporter/exporterhelper" ) const ( @@ -29,12 +28,12 @@ const ( // NewFactory creates a factory for AlibabaCloud LogService exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter), - exporterhelper.WithMetrics(createMetricsExporter), - exporterhelper.WithLogs(createLogsExporter)) + component.WithTracesExporter(createTracesExporter), + component.WithMetricsExporter(createMetricsExporter), + component.WithLogsExporter(createLogsExporter)) } // CreateDefaultConfig creates the default configuration for exporter. diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index e078cebc069c..e2d7eae685d4 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -7,7 +7,7 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index 5a2df7322438..3487f51c4996 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -366,8 +366,8 @@ 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/awscloudwatchlogsexporter/factory.go b/exporter/awscloudwatchlogsexporter/factory.go index daf8b8ac4769..5becec871e4b 100644 --- a/exporter/awscloudwatchlogsexporter/factory.go +++ b/exporter/awscloudwatchlogsexporter/factory.go @@ -30,10 +30,10 @@ import ( const typeStr = "awscloudwatchlogs" func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithLogs(createLogsExporter)) + component.WithLogsExporter(createLogsExporter)) } func createDefaultConfig() config.Exporter { diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index e8334d873a7b..6c9e02b2342f 100644 --- a/exporter/awscloudwatchlogsexporter/go.mod +++ b/exporter/awscloudwatchlogsexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum index 4bc9920b190e..b651543fbb9e 100644 --- a/exporter/awscloudwatchlogsexporter/go.sum +++ b/exporter/awscloudwatchlogsexporter/go.sum @@ -168,8 +168,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/awsemfexporter/factory.go b/exporter/awsemfexporter/factory.go index 1cb75cc7f8bd..767934f93437 100644 --- a/exporter/awsemfexporter/factory.go +++ b/exporter/awsemfexporter/factory.go @@ -19,7 +19,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil" ) @@ -31,10 +30,10 @@ const ( // NewFactory creates a factory for AWS EMF exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithMetrics(createMetricsExporter)) + component.WithMetricsExporter(createMetricsExporter)) } // CreateDefaultConfig creates the default configuration for exporter. diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index c7020eecda3e..ea403f6b3fc7 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -13,7 +13,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 google.golang.org/protobuf v1.27.1 diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index 9d02e84c501f..2e0c843e129d 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -194,8 +194,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/awskinesisexporter/factory.go b/exporter/awskinesisexporter/factory.go index 825605b8d2d1..4dd8f323cbc0 100644 --- a/exporter/awskinesisexporter/factory.go +++ b/exporter/awskinesisexporter/factory.go @@ -34,12 +34,12 @@ const ( // NewFactory creates a factory for Kinesis exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(NewTracesExporter), - exporterhelper.WithMetrics(NewMetricsExporter), - exporterhelper.WithLogs(NewLogsExporter), + component.WithTracesExporter(NewTracesExporter), + component.WithMetricsExporter(NewMetricsExporter), + component.WithLogsExporter(NewLogsExporter), ) } diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index c85e4434f352..4643c2936256 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index d12b5b259fb2..e00516bf2199 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -242,8 +242,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/awsprometheusremotewriteexporter/go.mod b/exporter/awsprometheusremotewriteexporter/go.mod index 623964f989e4..f11ab8408e6a 100644 --- a/exporter/awsprometheusremotewriteexporter/go.mod +++ b/exporter/awsprometheusremotewriteexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.43.4 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 ) require ( diff --git a/exporter/awsprometheusremotewriteexporter/go.sum b/exporter/awsprometheusremotewriteexporter/go.sum index 27ae610333f9..457fc3ca0787 100644 --- a/exporter/awsprometheusremotewriteexporter/go.sum +++ b/exporter/awsprometheusremotewriteexporter/go.sum @@ -1317,8 +1317,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/awsxrayexporter/factory.go b/exporter/awsxrayexporter/factory.go index e15ffd8dc0c5..86fa1bb02b61 100644 --- a/exporter/awsxrayexporter/factory.go +++ b/exporter/awsxrayexporter/factory.go @@ -19,7 +19,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/exporter/exporterhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil" ) @@ -31,10 +30,10 @@ const ( // NewFactory creates a factory for AWS-Xray exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter)) + component.WithTracesExporter(createTracesExporter)) } func createDefaultConfig() config.Exporter { diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index 14958fd150a4..7917de31ce27 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index 0ceeb3927542..1c72ed74c2db 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -170,8 +170,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/azuremonitorexporter/factory.go b/exporter/azuremonitorexporter/factory.go index 8669f137ae3e..f485145dc702 100644 --- a/exporter/azuremonitorexporter/factory.go +++ b/exporter/azuremonitorexporter/factory.go @@ -22,7 +22,6 @@ import ( "github.com/microsoft/ApplicationInsights-Go/appinsights" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/exporter/exporterhelper" "go.uber.org/zap" ) @@ -39,11 +38,11 @@ var ( // NewFactory returns a factory for Azure Monitor exporter. func NewFactory() component.ExporterFactory { f := &factory{} - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(f.createTracesExporter), - exporterhelper.WithLogs(f.createLogsExporter)) + component.WithTracesExporter(f.createTracesExporter), + component.WithLogsExporter(f.createLogsExporter)) } // Implements the interface from go.opentelemetry.io/collector/exporter/factory.go diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index c95040772a8e..c25c6c21c848 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/microsoft/ApplicationInsights-Go v0.4.4 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index 052511afb2d7..aa9c9afeda47 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -181,8 +181,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/carbonexporter/factory.go b/exporter/carbonexporter/factory.go index 3b91fb5937f7..7884e191d8a2 100644 --- a/exporter/carbonexporter/factory.go +++ b/exporter/carbonexporter/factory.go @@ -19,7 +19,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/exporter/exporterhelper" ) const ( @@ -29,10 +28,10 @@ const ( // NewFactory creates a factory for Carbon exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithMetrics(createMetricsExporter)) + component.WithMetricsExporter(createMetricsExporter)) } func createDefaultConfig() config.Exporter { diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index 32689cfeca32..18a3ee6e64b5 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a google.golang.org/protobuf v1.27.1 diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index f55f8a018db1..e37e4ab40326 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -185,8 +185,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/clickhouseexporter/factory.go b/exporter/clickhouseexporter/factory.go index 98cf846272e4..bb44df9283e5 100644 --- a/exporter/clickhouseexporter/factory.go +++ b/exporter/clickhouseexporter/factory.go @@ -30,10 +30,10 @@ const ( // NewFactory creates a factory for Elastic exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithLogs(createLogsExporter), + component.WithLogsExporter(createLogsExporter), ) } diff --git a/exporter/clickhouseexporter/go.mod b/exporter/clickhouseexporter/go.mod index f8774e5ce49f..fca6a0da37ec 100644 --- a/exporter/clickhouseexporter/go.mod +++ b/exporter/clickhouseexporter/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickh go 1.17 require ( - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 diff --git a/exporter/clickhouseexporter/go.sum b/exporter/clickhouseexporter/go.sum index 8562a91d2b3f..954682286c76 100644 --- a/exporter/clickhouseexporter/go.sum +++ b/exporter/clickhouseexporter/go.sum @@ -147,8 +147,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/exporter/coralogixexporter/factory.go b/exporter/coralogixexporter/factory.go index 7a0cbbc970ad..2ccc1f19729b 100644 --- a/exporter/coralogixexporter/factory.go +++ b/exporter/coralogixexporter/factory.go @@ -25,10 +25,10 @@ import ( // NewFactory by Coralogix func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typestr, createDefaultConfig, - exporterhelper.WithTraces(createTraceExporter), + component.WithTracesExporter(createTraceExporter), ) } diff --git a/exporter/coralogixexporter/go.mod b/exporter/coralogixexporter/go.mod index 8912bcd2837c..7e94ce2a0e86 100644 --- a/exporter/coralogixexporter/go.mod +++ b/exporter/coralogixexporter/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 ) require ( diff --git a/exporter/coralogixexporter/go.sum b/exporter/coralogixexporter/go.sum index 3f173efcaa01..36a5fa99ca16 100644 --- a/exporter/coralogixexporter/go.sum +++ b/exporter/coralogixexporter/go.sum @@ -219,8 +219,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/datadogexporter/factory.go b/exporter/datadogexporter/factory.go index 92bd1101c66f..7825e3c2fe7e 100644 --- a/exporter/datadogexporter/factory.go +++ b/exporter/datadogexporter/factory.go @@ -38,11 +38,11 @@ const ( // NewFactory creates a Datadog exporter factory func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithMetrics(createMetricsExporter), - exporterhelper.WithTraces(createTracesExporter), + component.WithMetricsExporter(createMetricsExporter), + component.WithTracesExporter(createTracesExporter), ) } diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 0bcf5afac806..ac5370b48aa9 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -13,7 +13,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.45.1 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index c558c121b3b9..780012f7f9e8 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -237,8 +237,8 @@ github.com/zorkian/go-datadog-api v2.30.0+incompatible h1:R4ryGocppDqZZbnNc5EDR8 github.com/zorkian/go-datadog-api v2.30.0+incompatible/go.mod h1:PkXwHX9CUQa/FpB9ZwAD45N1uhCW4MT/Wj7m36PbKss= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/dynatraceexporter/factory.go b/exporter/dynatraceexporter/factory.go index bc841ff00a18..d00ba11164a4 100644 --- a/exporter/dynatraceexporter/factory.go +++ b/exporter/dynatraceexporter/factory.go @@ -33,10 +33,10 @@ const ( // NewFactory creates a Dynatrace exporter factory func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithMetrics(createMetricsExporter), + component.WithMetricsExporter(createMetricsExporter), ) } diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index dde320b0105d..7a9b5d9bfda0 100644 --- a/exporter/dynatraceexporter/go.mod +++ b/exporter/dynatraceexporter/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum index bb0dd1a8d7ab..cf1495b16ce4 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/go.sum @@ -181,8 +181,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/elasticexporter/factory.go b/exporter/elasticexporter/factory.go index 29ff9b40a847..2722c39a19a5 100644 --- a/exporter/elasticexporter/factory.go +++ b/exporter/elasticexporter/factory.go @@ -19,7 +19,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/exporter/exporterhelper" ) const ( @@ -29,11 +28,11 @@ const ( // NewFactory creates a factory for Elastic exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter), - exporterhelper.WithMetrics(createMetricsExporter), + component.WithTracesExporter(createTracesExporter), + component.WithMetricsExporter(createMetricsExporter), ) } diff --git a/exporter/elasticexporter/go.mod b/exporter/elasticexporter/go.mod index 6ae48339d45b..c6124e0eabc9 100644 --- a/exporter/elasticexporter/go.mod +++ b/exporter/elasticexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/stretchr/testify v1.7.0 go.elastic.co/apm v1.15.0 go.elastic.co/fastjson v1.1.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/exporter/elasticexporter/go.sum b/exporter/elasticexporter/go.sum index 1cbc95b7d2fa..f9ed06c5a58e 100644 --- a/exporter/elasticexporter/go.sum +++ b/exporter/elasticexporter/go.sum @@ -188,8 +188,8 @@ go.elastic.co/fastjson v1.1.0 h1:3MrGBWWVIxe/xvsbpghtkFoPciPhOCmjsR/HfwEeQR4= go.elastic.co/fastjson v1.1.0/go.mod h1:boNGISWMjQsUPy/t6yqt2/1Wx4YNPSe+mZjlyw9vKKI= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/elasticsearchexporter/factory.go b/exporter/elasticsearchexporter/factory.go index 6d56b3648c9d..bdb31e5ec97c 100644 --- a/exporter/elasticsearchexporter/factory.go +++ b/exporter/elasticsearchexporter/factory.go @@ -31,10 +31,10 @@ const ( // NewFactory creates a factory for Elastic exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithLogs(createLogsExporter), + component.WithLogsExporter(createLogsExporter), ) } diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index b4755708ccf2..90ccba8106c2 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/elastic/go-structform v0.0.9 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index 74fa87f12a51..95eb2af47a44 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -170,8 +170,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index c7d8c3b6d0ad..96c2d26babf4 100644 --- a/exporter/f5cloudexporter/go.mod +++ b/exporter/f5cloudexporter/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 google.golang.org/api v0.68.0 ) diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum index 917e15708ad8..5082114f4c09 100644 --- a/exporter/f5cloudexporter/go.sum +++ b/exporter/f5cloudexporter/go.sum @@ -309,8 +309,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/fileexporter/factory.go b/exporter/fileexporter/factory.go index 1449a2756ef6..f8541392a6c2 100644 --- a/exporter/fileexporter/factory.go +++ b/exporter/fileexporter/factory.go @@ -31,12 +31,12 @@ const ( // NewFactory creates a factory for OTLP exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter), - exporterhelper.WithMetrics(createMetricsExporter), - exporterhelper.WithLogs(createLogsExporter)) + component.WithTracesExporter(createTracesExporter), + component.WithMetricsExporter(createMetricsExporter), + component.WithLogsExporter(createLogsExporter)) } func createDefaultConfig() config.Exporter { diff --git a/exporter/fileexporter/go.mod b/exporter/fileexporter/go.mod index 7b36475c5010..cf5e09a82cbe 100644 --- a/exporter/fileexporter/go.mod +++ b/exporter/fileexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a ) diff --git a/exporter/fileexporter/go.sum b/exporter/fileexporter/go.sum index 1b341736115c..211a0b3f264d 100644 --- a/exporter/fileexporter/go.sum +++ b/exporter/fileexporter/go.sum @@ -159,8 +159,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/googlecloudexporter/factory.go b/exporter/googlecloudexporter/factory.go index 551f95dce64d..51efca6eb77d 100644 --- a/exporter/googlecloudexporter/factory.go +++ b/exporter/googlecloudexporter/factory.go @@ -42,11 +42,11 @@ func NewFactory() component.ExporterFactory { view.Register(ocgrpc.DefaultClientViews...) }) - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter), - exporterhelper.WithMetrics(createMetricsExporter), + component.WithTracesExporter(createTracesExporter), + component.WithMetricsExporter(createMetricsExporter), ) } diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index 0b2006f7570b..cf3f3c0fa158 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -10,7 +10,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.45.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.opentelemetry.io/otel v1.4.1 go.opentelemetry.io/otel/sdk v1.4.1 diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index d1e1cc8d4559..2520baa7e636 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -322,8 +322,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/googlecloudpubsubexporter/factory.go b/exporter/googlecloudpubsubexporter/factory.go index f89cf88b4a0f..bc91cf2adcc4 100644 --- a/exporter/googlecloudpubsubexporter/factory.go +++ b/exporter/googlecloudpubsubexporter/factory.go @@ -32,12 +32,12 @@ const ( ) func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter), - exporterhelper.WithMetrics(createMetricsExporter), - exporterhelper.WithLogs(createLogsExporter)) + component.WithTracesExporter(createTracesExporter), + component.WithMetricsExporter(createMetricsExporter), + component.WithLogsExporter(createLogsExporter)) } var exporters = map[*Config]*pubsubExporter{} diff --git a/exporter/googlecloudpubsubexporter/go.mod b/exporter/googlecloudpubsubexporter/go.mod index f46edeb5f6c6..719bb2f063f6 100644 --- a/exporter/googlecloudpubsubexporter/go.mod +++ b/exporter/googlecloudpubsubexporter/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 diff --git a/exporter/googlecloudpubsubexporter/go.sum b/exporter/googlecloudpubsubexporter/go.sum index ae8ca057c10f..14a60bd30a7c 100644 --- a/exporter/googlecloudpubsubexporter/go.sum +++ b/exporter/googlecloudpubsubexporter/go.sum @@ -165,8 +165,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/honeycombexporter/factory.go b/exporter/honeycombexporter/factory.go index 79e589c4a569..1ba88ef3567e 100644 --- a/exporter/honeycombexporter/factory.go +++ b/exporter/honeycombexporter/factory.go @@ -29,10 +29,10 @@ const ( // NewFactory creates a factory for Honeycomb exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter)) + component.WithTracesExporter(createTracesExporter)) } func createDefaultConfig() config.Exporter { diff --git a/exporter/honeycombexporter/go.mod b/exporter/honeycombexporter/go.mod index 6b9ea0bb5d0e..57c6f1a1618e 100644 --- a/exporter/honeycombexporter/go.mod +++ b/exporter/honeycombexporter/go.mod @@ -7,7 +7,7 @@ require ( github.com/honeycombio/libhoney-go v1.15.8 github.com/klauspost/compress v1.14.4 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/exporter/honeycombexporter/go.sum b/exporter/honeycombexporter/go.sum index d260b1706025..fbb3cd7c124a 100644 --- a/exporter/honeycombexporter/go.sum +++ b/exporter/honeycombexporter/go.sum @@ -189,8 +189,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/humioexporter/factory.go b/exporter/humioexporter/factory.go index b5321d111e2a..bbc06664f66b 100644 --- a/exporter/humioexporter/factory.go +++ b/exporter/humioexporter/factory.go @@ -31,10 +31,10 @@ const ( // NewFactory creates an exporter factory for Humio func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter), + component.WithTracesExporter(createTracesExporter), ) } diff --git a/exporter/humioexporter/go.mod b/exporter/humioexporter/go.mod index 87db5b18cc51..f7d842470fd7 100644 --- a/exporter/humioexporter/go.mod +++ b/exporter/humioexporter/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a ) diff --git a/exporter/humioexporter/go.sum b/exporter/humioexporter/go.sum index a836aefaeefa..2b4466c1a5e1 100644 --- a/exporter/humioexporter/go.sum +++ b/exporter/humioexporter/go.sum @@ -188,8 +188,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/influxdbexporter/factory.go b/exporter/influxdbexporter/factory.go index 2926a489b01e..e467f954b529 100644 --- a/exporter/influxdbexporter/factory.go +++ b/exporter/influxdbexporter/factory.go @@ -26,12 +26,12 @@ import ( // NewFactory creates a factory for Jaeger Thrift over HTTP exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTraceExporter), - exporterhelper.WithMetrics(createMetricsExporter), - exporterhelper.WithLogs(createLogsExporter), + component.WithTracesExporter(createTraceExporter), + component.WithMetricsExporter(createMetricsExporter), + component.WithLogsExporter(createLogsExporter), ) } diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod index 3942a06b9e5c..67a2a5d737d2 100644 --- a/exporter/influxdbexporter/go.mod +++ b/exporter/influxdbexporter/go.mod @@ -7,7 +7,7 @@ require ( github.com/influxdata/influxdb-observability/otel2influx v0.2.10 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 diff --git a/exporter/influxdbexporter/go.sum b/exporter/influxdbexporter/go.sum index f993bf296873..4e49dc47dd76 100644 --- a/exporter/influxdbexporter/go.sum +++ b/exporter/influxdbexporter/go.sum @@ -207,8 +207,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.39.0/go.mod h1:gS8A27wi+8gM3hrXL+dEjTbrbLxktjHjAwwqI31ELgQ= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= diff --git a/exporter/jaegerexporter/factory.go b/exporter/jaegerexporter/factory.go index d7e5fb01a8f0..b156d6ad68c8 100644 --- a/exporter/jaegerexporter/factory.go +++ b/exporter/jaegerexporter/factory.go @@ -31,10 +31,10 @@ const ( // NewFactory creates a factory for Jaeger exporter func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter)) + component.WithTracesExporter(createTracesExporter)) } func createDefaultConfig() config.Exporter { diff --git a/exporter/jaegerexporter/go.mod b/exporter/jaegerexporter/go.mod index 6326d86d6390..140e9e35f680 100644 --- a/exporter/jaegerexporter/go.mod +++ b/exporter/jaegerexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.45.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 google.golang.org/grpc v1.44.0 diff --git a/exporter/jaegerexporter/go.sum b/exporter/jaegerexporter/go.sum index cde2b83d3d23..86c54f3f69ca 100644 --- a/exporter/jaegerexporter/go.sum +++ b/exporter/jaegerexporter/go.sum @@ -217,8 +217,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/jaegerthrifthttpexporter/factory.go b/exporter/jaegerthrifthttpexporter/factory.go index 66a05361416e..d007dbc7afed 100644 --- a/exporter/jaegerthrifthttpexporter/factory.go +++ b/exporter/jaegerthrifthttpexporter/factory.go @@ -32,10 +32,10 @@ const ( // NewFactory creates a factory for Jaeger Thrift over HTTP exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter)) + component.WithTracesExporter(createTracesExporter)) } func createDefaultConfig() config.Exporter { diff --git a/exporter/jaegerthrifthttpexporter/go.mod b/exporter/jaegerthrifthttpexporter/go.mod index 9485b3bea0e5..d4abdd8761da 100644 --- a/exporter/jaegerthrifthttpexporter/go.mod +++ b/exporter/jaegerthrifthttpexporter/go.mod @@ -7,7 +7,7 @@ require ( github.com/jaegertracing/jaeger v1.31.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a ) diff --git a/exporter/jaegerthrifthttpexporter/go.sum b/exporter/jaegerthrifthttpexporter/go.sum index 8f096e640734..f25fc6a894e8 100644 --- a/exporter/jaegerthrifthttpexporter/go.sum +++ b/exporter/jaegerthrifthttpexporter/go.sum @@ -200,8 +200,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/kafkaexporter/factory.go b/exporter/kafkaexporter/factory.go index 98e4a8e6c20a..4ea59a7dfd3b 100644 --- a/exporter/kafkaexporter/factory.go +++ b/exporter/kafkaexporter/factory.go @@ -66,12 +66,12 @@ func NewFactory(options ...FactoryOption) component.ExporterFactory { for _, o := range options { o(f) } - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(f.createTracesExporter), - exporterhelper.WithMetrics(f.createMetricsExporter), - exporterhelper.WithLogs(f.createLogsExporter), + component.WithTracesExporter(f.createTracesExporter), + component.WithMetricsExporter(f.createMetricsExporter), + component.WithLogsExporter(f.createLogsExporter), ) } diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index ba36a15dbd17..e684c5e12802 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -11,7 +11,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.45.1 github.com/stretchr/testify v1.7.0 github.com/xdg-go/scram v1.1.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/exporter/kafkaexporter/go.sum b/exporter/kafkaexporter/go.sum index 0d7504c79356..5faa8429e49a 100644 --- a/exporter/kafkaexporter/go.sum +++ b/exporter/kafkaexporter/go.sum @@ -229,8 +229,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/loadbalancingexporter/factory.go b/exporter/loadbalancingexporter/factory.go index dcf27a21e124..6efaf4fd0a4f 100644 --- a/exporter/loadbalancingexporter/factory.go +++ b/exporter/loadbalancingexporter/factory.go @@ -20,7 +20,6 @@ import ( "go.opencensus.io/stats/view" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/exporter/otlpexporter" ) @@ -33,11 +32,11 @@ const ( func NewFactory() component.ExporterFactory { view.Register(MetricViews()...) - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter), - exporterhelper.WithLogs(createLogExporter), + component.WithTracesExporter(createTracesExporter), + component.WithLogsExporter(createLogExporter), ) } diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index 2cb48387b736..9ce4a343272c 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.45.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index 518c4ae7df68..21b0505a1839 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -318,8 +318,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/loadbalancingexporter/loadbalancer_test.go b/exporter/loadbalancingexporter/loadbalancer_test.go index 06f5076ed49b..f05881889ddd 100644 --- a/exporter/loadbalancingexporter/loadbalancer_test.go +++ b/exporter/loadbalancingexporter/loadbalancer_test.go @@ -25,7 +25,6 @@ import ( "go.opentelemetry.io/collector/component/componenthelper" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/model/pdata" ) @@ -211,9 +210,9 @@ func TestRemoveExtraExporters(t *testing.T) { func TestAddMissingExporters(t *testing.T) { // prepare cfg := simpleConfig() - exporterFactory := exporterhelper.NewFactory("otlp", func() config.Exporter { + exporterFactory := component.NewExporterFactory("otlp", func() config.Exporter { return &otlpexporter.Config{} - }, exporterhelper.WithTraces(func( + }, component.WithTracesExporter(func( _ context.Context, _ component.ExporterCreateSettings, _ config.Exporter, @@ -245,9 +244,9 @@ func TestFailedToAddMissingExporters(t *testing.T) { // prepare cfg := simpleConfig() expectedErr := errors.New("some expected error") - exporterFactory := exporterhelper.NewFactory("otlp", func() config.Exporter { + exporterFactory := component.NewExporterFactory("otlp", func() config.Exporter { return &otlpexporter.Config{} - }, exporterhelper.WithTraces(func( + }, component.WithTracesExporter(func( _ context.Context, _ component.ExporterCreateSettings, _ config.Exporter, diff --git a/exporter/logzioexporter/factory.go b/exporter/logzioexporter/factory.go index 86da3ff9282f..65dfc8a62dad 100644 --- a/exporter/logzioexporter/factory.go +++ b/exporter/logzioexporter/factory.go @@ -19,17 +19,16 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/exporter/exporterhelper" ) const typeStr = "logzio" // NewFactory creates a factory for Logz.io exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter)) + component.WithTracesExporter(createTracesExporter)) } func createDefaultConfig() config.Exporter { diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index ddb546f11a05..394f183fc3dc 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/logzio/jaeger-logzio v1.0.4 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index bb5103182adf..526f219c781a 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -842,8 +842,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/lokiexporter/factory.go b/exporter/lokiexporter/factory.go index 8d99f3f52c74..44564596e5a7 100644 --- a/exporter/lokiexporter/factory.go +++ b/exporter/lokiexporter/factory.go @@ -28,10 +28,10 @@ const typeStr = "loki" // NewFactory creates a factory for Loki exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithLogs(createLogsExporter), + component.WithLogsExporter(createLogsExporter), ) } diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index 2e234174da9d..87005ec9b520 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -9,7 +9,7 @@ require ( github.com/prometheus/common v0.32.1 github.com/prometheus/prometheus v1.8.2-0.20220111145625-076109fa1910 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 google.golang.org/grpc v1.44.0 diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index 39f0aebe09b3..91990268df19 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -1307,8 +1307,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/newrelicexporter/factory.go b/exporter/newrelicexporter/factory.go index ef5192932e8b..7f6638fd7503 100644 --- a/exporter/newrelicexporter/factory.go +++ b/exporter/newrelicexporter/factory.go @@ -35,12 +35,12 @@ var once sync.Once func NewFactory() component.ExporterFactory { view.Register(MetricViews()...) - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter), - exporterhelper.WithMetrics(createMetricsExporter), - exporterhelper.WithLogs(createLogsExporter), + component.WithTracesExporter(createTracesExporter), + component.WithMetricsExporter(createMetricsExporter), + component.WithLogsExporter(createLogsExporter), ) } diff --git a/exporter/newrelicexporter/go.mod b/exporter/newrelicexporter/go.mod index 1592d3323867..eecfdfe57efe 100644 --- a/exporter/newrelicexporter/go.mod +++ b/exporter/newrelicexporter/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.45.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/exporter/newrelicexporter/go.sum b/exporter/newrelicexporter/go.sum index ae68c4bfcde9..585831a7aee0 100644 --- a/exporter/newrelicexporter/go.sum +++ b/exporter/newrelicexporter/go.sum @@ -187,8 +187,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/observiqexporter/factory.go b/exporter/observiqexporter/factory.go index 6d02045e4f88..f0a3bdeef5a5 100644 --- a/exporter/observiqexporter/factory.go +++ b/exporter/observiqexporter/factory.go @@ -33,10 +33,10 @@ const ( // NewFactory creates a factory for observIQ exporter func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithLogs(createLogsExporter), + component.WithLogsExporter(createLogsExporter), ) } diff --git a/exporter/observiqexporter/go.mod b/exporter/observiqexporter/go.mod index 2ab408595fa2..6e0e1ee148d5 100644 --- a/exporter/observiqexporter/go.mod +++ b/exporter/observiqexporter/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/google/uuid v1.3.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/exporter/observiqexporter/go.sum b/exporter/observiqexporter/go.sum index 29f28f4e52ba..a07f18d7c8df 100644 --- a/exporter/observiqexporter/go.sum +++ b/exporter/observiqexporter/go.sum @@ -158,8 +158,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/opencensusexporter/factory.go b/exporter/opencensusexporter/factory.go index 1f7cbb83d298..4e9370edceed 100644 --- a/exporter/opencensusexporter/factory.go +++ b/exporter/opencensusexporter/factory.go @@ -31,11 +31,11 @@ const ( // NewFactory creates a factory for OTLP exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter), - exporterhelper.WithMetrics(createMetricsExporter)) + component.WithTracesExporter(createTracesExporter), + component.WithMetricsExporter(createMetricsExporter)) } func createDefaultConfig() config.Exporter { diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index 860a1be1a795..e4f757c407e8 100644 --- a/exporter/opencensusexporter/go.mod +++ b/exporter/opencensusexporter/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a google.golang.org/grpc v1.44.0 ) diff --git a/exporter/opencensusexporter/go.sum b/exporter/opencensusexporter/go.sum index e3854645f12d..d132cbf2bf57 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -216,8 +216,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/parquetexporter/factory.go b/exporter/parquetexporter/factory.go index 004757991c5c..10f36f5757cf 100644 --- a/exporter/parquetexporter/factory.go +++ b/exporter/parquetexporter/factory.go @@ -34,12 +34,12 @@ type Config struct { // NewFactory creates a factory for the Parquet exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter), - exporterhelper.WithMetrics(createMetricsExporter), - exporterhelper.WithLogs(createLogsExporter)) + component.WithTracesExporter(createTracesExporter), + component.WithMetricsExporter(createMetricsExporter), + component.WithLogsExporter(createLogsExporter)) } func createDefaultConfig() config.Exporter { diff --git a/exporter/parquetexporter/go.mod b/exporter/parquetexporter/go.mod index 5d0e5117ef06..4b25e7354f66 100644 --- a/exporter/parquetexporter/go.mod +++ b/exporter/parquetexporter/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parque go 1.17 require ( - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a ) diff --git a/exporter/parquetexporter/go.sum b/exporter/parquetexporter/go.sum index 7297143dfe0f..c9ff004b0c2a 100644 --- a/exporter/parquetexporter/go.sum +++ b/exporter/parquetexporter/go.sum @@ -148,8 +148,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/exporter/prometheusexporter/factory.go b/exporter/prometheusexporter/factory.go index 32a86d302efd..331bc20c5167 100644 --- a/exporter/prometheusexporter/factory.go +++ b/exporter/prometheusexporter/factory.go @@ -34,10 +34,10 @@ const ( // NewFactory creates a new Prometheus exporter factory. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithMetrics(createMetricsExporter)) + component.WithMetricsExporter(createMetricsExporter)) } func createDefaultConfig() config.Exporter { diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index c6e987d33ddc..1a6347a1b21a 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -10,7 +10,7 @@ require ( github.com/prometheus/client_model v0.2.0 github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/exporter/prometheusexporter/go.sum b/exporter/prometheusexporter/go.sum index a5eac1984bcf..1b8d95cab632 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -1430,8 +1430,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/prometheusremotewriteexporter/factory.go b/exporter/prometheusremotewriteexporter/factory.go index 3b8cd6eec501..f5fe4b0b9203 100644 --- a/exporter/prometheusremotewriteexporter/factory.go +++ b/exporter/prometheusremotewriteexporter/factory.go @@ -35,10 +35,10 @@ const ( // NewFactory creates a new Prometheus Remote Write exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithMetrics(createMetricsExporter)) + component.WithMetricsExporter(createMetricsExporter)) } func createMetricsExporter(_ context.Context, set component.ExporterCreateSettings, diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index b2884cf90a5f..eb61ccfbc596 100644 --- a/exporter/prometheusremotewriteexporter/go.mod +++ b/exporter/prometheusremotewriteexporter/go.mod @@ -11,7 +11,7 @@ require ( github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 github.com/stretchr/testify v1.7.0 github.com/tidwall/wal v1.1.7 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 ) diff --git a/exporter/prometheusremotewriteexporter/go.sum b/exporter/prometheusremotewriteexporter/go.sum index 5fdd4b98cc9b..f8d45f6dc4e9 100644 --- a/exporter/prometheusremotewriteexporter/go.sum +++ b/exporter/prometheusremotewriteexporter/go.sum @@ -1313,8 +1313,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/sapmexporter/factory.go b/exporter/sapmexporter/factory.go index e6cd07760510..7046bcee7400 100644 --- a/exporter/sapmexporter/factory.go +++ b/exporter/sapmexporter/factory.go @@ -31,10 +31,10 @@ const ( // NewFactory creates a factory for SAPM exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter)) + component.WithTracesExporter(createTracesExporter)) } func createDefaultConfig() config.Exporter { diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index 6151a815804b..e86abeb7bcf8 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.45.1 github.com/signalfx/sapm-proto v0.9.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index da0378eb1431..b95f97cab730 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -822,8 +822,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.44.0/go.mod h1:4jo1R8uBDspLCxUGhQ0k3v/EFXFbW7s0AIy3LuGLbcU= go.opentelemetry.io/collector/model v0.45.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= diff --git a/exporter/sentryexporter/factory.go b/exporter/sentryexporter/factory.go index 7e782fdee006..560fba29c6bd 100644 --- a/exporter/sentryexporter/factory.go +++ b/exporter/sentryexporter/factory.go @@ -20,7 +20,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/exporter/exporterhelper" ) const ( @@ -29,10 +28,10 @@ const ( // NewFactory creates a factory for Sentry exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter), + component.WithTracesExporter(createTracesExporter), ) } diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index ef8589216042..6652660769a0 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/getsentry/sentry-go v0.12.0 github.com/google/go-cmp v0.5.7 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a ) diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index 8d9c047a4466..7ae58c96a3e4 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -285,8 +285,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/signalfxexporter/factory.go b/exporter/signalfxexporter/factory.go index e35bc15d7079..c2796dab5c1b 100644 --- a/exporter/signalfxexporter/factory.go +++ b/exporter/signalfxexporter/factory.go @@ -42,12 +42,12 @@ const ( // NewFactory creates a factory for SignalFx exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithMetrics(createMetricsExporter), - exporterhelper.WithLogs(createLogsExporter), - exporterhelper.WithTraces(createTracesExporter), + component.WithMetricsExporter(createMetricsExporter), + component.WithLogsExporter(createLogsExporter), + component.WithTracesExporter(createTracesExporter), ) } diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index 3c65352cd265..675680907dc4 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -14,7 +14,7 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20201202163743-65b4fa925fc8 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index 973f6f5b58db..95565136c58c 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -272,8 +272,8 @@ go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/skywalkingexporter/factory.go b/exporter/skywalkingexporter/factory.go index 7d4de17bf3cb..863e0ba5b7dc 100644 --- a/exporter/skywalkingexporter/factory.go +++ b/exporter/skywalkingexporter/factory.go @@ -31,11 +31,11 @@ const ( // NewFactory creates a factory for Skywalking exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithLogs(createLogsExporter), - exporterhelper.WithMetrics(createMetricsExporter)) + component.WithLogsExporter(createLogsExporter), + component.WithMetricsExporter(createMetricsExporter)) } func createDefaultConfig() config.Exporter { diff --git a/exporter/skywalkingexporter/go.mod b/exporter/skywalkingexporter/go.mod index 106be2e07452..0b14bed9441d 100644 --- a/exporter/skywalkingexporter/go.mod +++ b/exporter/skywalkingexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a google.golang.org/grpc v1.44.0 skywalking.apache.org/repo/goapi v0.0.0-20211122071111-ffc517fbfe21 diff --git a/exporter/skywalkingexporter/go.sum b/exporter/skywalkingexporter/go.sum index c047813831b8..9f9166c092ac 100644 --- a/exporter/skywalkingexporter/go.sum +++ b/exporter/skywalkingexporter/go.sum @@ -205,8 +205,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/splunkhecexporter/factory.go b/exporter/splunkhecexporter/factory.go index d729c1471667..c1c0f2380337 100644 --- a/exporter/splunkhecexporter/factory.go +++ b/exporter/splunkhecexporter/factory.go @@ -50,12 +50,12 @@ type baseLogsExporter struct { // NewFactory creates a factory for Splunk HEC exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter), - exporterhelper.WithMetrics(createMetricsExporter), - exporterhelper.WithLogs(createLogsExporter)) + component.WithTracesExporter(createTracesExporter), + component.WithMetricsExporter(createMetricsExporter), + component.WithLogsExporter(createLogsExporter)) } func createDefaultConfig() config.Exporter { diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index 70983638b044..2d329eb5c037 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -10,7 +10,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index 35bb9c5c17ac..648c3e4e1647 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -194,8 +194,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/stackdriverexporter/go.mod b/exporter/stackdriverexporter/go.mod index 157fd160762c..95f12036f869 100644 --- a/exporter/stackdriverexporter/go.mod +++ b/exporter/stackdriverexporter/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 ) diff --git a/exporter/stackdriverexporter/go.sum b/exporter/stackdriverexporter/go.sum index c09685e898ce..ede4b327d9ed 100644 --- a/exporter/stackdriverexporter/go.sum +++ b/exporter/stackdriverexporter/go.sum @@ -317,8 +317,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.26.0/go.mod h1:4vatbW3QwS11DK0H0SB7FR31/VbthXcYorswdkVXdyg= diff --git a/exporter/sumologicexporter/factory.go b/exporter/sumologicexporter/factory.go index d02101544be4..b8e747d0b041 100644 --- a/exporter/sumologicexporter/factory.go +++ b/exporter/sumologicexporter/factory.go @@ -30,11 +30,11 @@ const ( // NewFactory returns a new factory for the sumologic exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithLogs(createLogsExporter), - exporterhelper.WithMetrics(createMetricsExporter), + component.WithLogsExporter(createLogsExporter), + component.WithMetricsExporter(createMetricsExporter), ) } diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index d6d8cf852db7..aa3db40e3c26 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 ) diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index 7b2cfa7a0910..5e807c18d9d4 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -186,8 +186,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= diff --git a/exporter/tanzuobservabilityexporter/factory.go b/exporter/tanzuobservabilityexporter/factory.go index 2cc6a17d6d93..fc310290a375 100644 --- a/exporter/tanzuobservabilityexporter/factory.go +++ b/exporter/tanzuobservabilityexporter/factory.go @@ -27,11 +27,11 @@ const exporterType = "tanzuobservability" // NewFactory creates a factory for the exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( exporterType, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter), - exporterhelper.WithMetrics(createMetricsExporter), + component.WithTracesExporter(createTracesExporter), + component.WithMetricsExporter(createMetricsExporter), ) } diff --git a/exporter/tanzuobservabilityexporter/go.mod b/exporter/tanzuobservabilityexporter/go.mod index a0f511088be7..e4d3b1531d07 100644 --- a/exporter/tanzuobservabilityexporter/go.mod +++ b/exporter/tanzuobservabilityexporter/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1 github.com/stretchr/testify v1.7.0 github.com/wavefronthq/wavefront-sdk-go v0.9.10 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/exporter/tanzuobservabilityexporter/go.sum b/exporter/tanzuobservabilityexporter/go.sum index 7edd0f370b04..eb53cd7cb1db 100644 --- a/exporter/tanzuobservabilityexporter/go.sum +++ b/exporter/tanzuobservabilityexporter/go.sum @@ -189,8 +189,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/tencentcloudlogserviceexporter/factory.go b/exporter/tencentcloudlogserviceexporter/factory.go index 639a7d8f6e76..cb2482560495 100644 --- a/exporter/tencentcloudlogserviceexporter/factory.go +++ b/exporter/tencentcloudlogserviceexporter/factory.go @@ -19,7 +19,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/exporter/exporterhelper" ) const ( @@ -29,10 +28,10 @@ const ( // NewFactory creates a factory for tencentcloud LogService exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithLogs(createLogsExporter)) + component.WithLogsExporter(createLogsExporter)) } // CreateDefaultConfig creates the default configuration for exporter. diff --git a/exporter/tencentcloudlogserviceexporter/go.mod b/exporter/tencentcloudlogserviceexporter/go.mod index d8a8b240edd8..07ded677819d 100644 --- a/exporter/tencentcloudlogserviceexporter/go.mod +++ b/exporter/tencentcloudlogserviceexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/pierrec/lz4 v2.6.1+incompatible github.com/stretchr/testify v1.7.0 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.352 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/exporter/tencentcloudlogserviceexporter/go.sum b/exporter/tencentcloudlogserviceexporter/go.sum index b6bd1a99aff1..0b8eab259740 100644 --- a/exporter/tencentcloudlogserviceexporter/go.sum +++ b/exporter/tencentcloudlogserviceexporter/go.sum @@ -173,8 +173,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/exporter/zipkinexporter/factory.go b/exporter/zipkinexporter/factory.go index 7c83e3edfeb6..43387d235fb1 100644 --- a/exporter/zipkinexporter/factory.go +++ b/exporter/zipkinexporter/factory.go @@ -38,10 +38,10 @@ const ( // NewFactory creates a factory for Zipkin exporter. func NewFactory() component.ExporterFactory { - return exporterhelper.NewFactory( + return component.NewExporterFactory( typeStr, createDefaultConfig, - exporterhelper.WithTraces(createTracesExporter)) + component.WithTracesExporter(createTracesExporter)) } func createDefaultConfig() config.Exporter { diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index dd02d35f0fb4..cf085c7df4a5 100644 --- a/exporter/zipkinexporter/go.mod +++ b/exporter/zipkinexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.45.1 github.com/openzipkin/zipkin-go v0.4.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a ) diff --git a/exporter/zipkinexporter/go.sum b/exporter/zipkinexporter/go.sum index 97b7ca3f532a..4aa29293967e 100644 --- a/exporter/zipkinexporter/go.sum +++ b/exporter/zipkinexporter/go.sum @@ -244,8 +244,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/extension/asapauthextension/go.mod b/extension/asapauthextension/go.mod index ea4237cbd30d..d1ed2627a43f 100644 --- a/extension/asapauthextension/go.mod +++ b/extension/asapauthextension/go.mod @@ -6,7 +6,7 @@ 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.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/multierr v1.7.0 google.golang.org/grpc v1.44.0 ) diff --git a/extension/asapauthextension/go.sum b/extension/asapauthextension/go.sum index f4986fdcf786..e46b002ca666 100644 --- a/extension/asapauthextension/go.sum +++ b/extension/asapauthextension/go.sum @@ -189,8 +189,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/extension/awsproxy/go.mod b/extension/awsproxy/go.mod index 0efa132a3777..0f0ed1401f40 100644 --- a/extension/awsproxy/go.mod +++ b/extension/awsproxy/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 ) diff --git a/extension/awsproxy/go.sum b/extension/awsproxy/go.sum index f4e4532abe04..d67b2f3dea33 100644 --- a/extension/awsproxy/go.sum +++ b/extension/awsproxy/go.sum @@ -138,8 +138,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/extension/basicauthextension/go.mod b/extension/basicauthextension/go.mod index d9ae98f16d9d..a0c22e074652 100644 --- a/extension/basicauthextension/go.mod +++ b/extension/basicauthextension/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 github.com/tg123/go-htpasswd v1.2.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 ) require ( diff --git a/extension/basicauthextension/go.sum b/extension/basicauthextension/go.sum index 53acded2d8aa..e92439d1a9a7 100644 --- a/extension/basicauthextension/go.sum +++ b/extension/basicauthextension/go.sum @@ -174,8 +174,8 @@ github.com/tg123/go-htpasswd v1.2.0/go.mod h1:h7IzlfpvIWnVJhNZ0nQ9HaFxHb7pn5uFJY github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/extension/bearertokenauthextension/go.mod b/extension/bearertokenauthextension/go.mod index 9a334fe2a314..090679cd01ef 100644 --- a/extension/bearertokenauthextension/go.mod +++ b/extension/bearertokenauthextension/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 google.golang.org/grpc v1.44.0 ) diff --git a/extension/bearertokenauthextension/go.sum b/extension/bearertokenauthextension/go.sum index a9ccc225357d..49279af821b1 100644 --- a/extension/bearertokenauthextension/go.sum +++ b/extension/bearertokenauthextension/go.sum @@ -178,8 +178,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/extension/fluentbitextension/go.mod b/extension/fluentbitextension/go.mod index 23113baaacd5..30081266e164 100644 --- a/extension/fluentbitextension/go.mod +++ b/extension/fluentbitextension/go.mod @@ -6,7 +6,7 @@ require ( github.com/davecgh/go-spew v1.1.1 github.com/shirou/gopsutil/v3 v3.22.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 ) diff --git a/extension/fluentbitextension/go.sum b/extension/fluentbitextension/go.sum index 0002ad33ae15..6e83296757fc 100644 --- a/extension/fluentbitextension/go.sum +++ b/extension/fluentbitextension/go.sum @@ -153,8 +153,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index 2a2aa98a022a..3ab5350d6414 100644 --- a/extension/healthcheckextension/go.mod +++ b/extension/healthcheckextension/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.45.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 ) diff --git a/extension/healthcheckextension/go.sum b/extension/healthcheckextension/go.sum index a6b3e48575d0..ee5fe9e98d06 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -158,8 +158,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/extension/httpforwarder/go.mod b/extension/httpforwarder/go.mod index 914b9da39ed8..09c44d42b6d6 100644 --- a/extension/httpforwarder/go.mod +++ b/extension/httpforwarder/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 ) diff --git a/extension/httpforwarder/go.sum b/extension/httpforwarder/go.sum index 69b2354f0634..626316d9736a 100644 --- a/extension/httpforwarder/go.sum +++ b/extension/httpforwarder/go.sum @@ -176,8 +176,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= diff --git a/extension/jaegerremotesampling/go.mod b/extension/jaegerremotesampling/go.mod index b4e14d644462..5ac584b8aa1f 100644 --- a/extension/jaegerremotesampling/go.mod +++ b/extension/jaegerremotesampling/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 ) require ( diff --git a/extension/jaegerremotesampling/go.sum b/extension/jaegerremotesampling/go.sum index a5d9cbca7677..59b6d6d2a425 100644 --- a/extension/jaegerremotesampling/go.sum +++ b/extension/jaegerremotesampling/go.sum @@ -317,8 +317,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/extension/oauth2clientauthextension/go.mod b/extension/oauth2clientauthextension/go.mod index 9c036cdd2878..d59c39771207 100644 --- a/extension/oauth2clientauthextension/go.mod +++ b/extension/oauth2clientauthextension/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 google.golang.org/grpc v1.44.0 diff --git a/extension/oauth2clientauthextension/go.sum b/extension/oauth2clientauthextension/go.sum index a9d282b828f5..7573d1be747e 100644 --- a/extension/oauth2clientauthextension/go.sum +++ b/extension/oauth2clientauthextension/go.sum @@ -305,8 +305,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod index 014b70d20def..7a5d5f7dd942 100644 --- a/extension/observer/dockerobserver/go.mod +++ b/extension/observer/dockerobserver/go.mod @@ -10,7 +10,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 ) diff --git a/extension/observer/dockerobserver/go.sum b/extension/observer/dockerobserver/go.sum index fb74c2dfbc17..8e039935992f 100644 --- a/extension/observer/dockerobserver/go.sum +++ b/extension/observer/dockerobserver/go.sum @@ -705,8 +705,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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod index deafda5693e5..3f7e7091f447 100644 --- a/extension/observer/ecsobserver/go.mod +++ b/extension/observer/ecsobserver/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.43.4 github.com/hashicorp/golang-lru v0.5.4 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/extension/observer/ecsobserver/go.sum b/extension/observer/ecsobserver/go.sum index d17f09e300e1..092e7404e370 100644 --- a/extension/observer/ecsobserver/go.sum +++ b/extension/observer/ecsobserver/go.sum @@ -145,8 +145,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/extension/observer/ecstaskobserver/go.mod b/extension/observer/ecstaskobserver/go.mod index d5fafc3a52e4..27e3949cbb5e 100644 --- a/extension/observer/ecstaskobserver/go.mod +++ b/extension/observer/ecstaskobserver/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 ) diff --git a/extension/observer/ecstaskobserver/go.sum b/extension/observer/ecstaskobserver/go.sum index c180ae2ba1a9..a1e92eb082eb 100644 --- a/extension/observer/ecstaskobserver/go.sum +++ b/extension/observer/ecstaskobserver/go.sum @@ -174,8 +174,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index 2e9489b366fd..5f06acbd75ed 100644 --- a/extension/observer/hostobserver/go.mod +++ b/extension/observer/hostobserver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.45.1 github.com/shirou/gopsutil/v3 v3.22.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 ) diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index 0002ad33ae15..6e83296757fc 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -153,8 +153,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index cbcbba1e812c..20cd67c62839 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 k8s.io/api v0.23.4 k8s.io/apimachinery v0.23.4 diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index 2be6f181b60e..7d20146654a9 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -365,8 +365,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod index 5c7f6615319a..1e369cc6ed76 100644 --- a/extension/oidcauthextension/go.mod +++ b/extension/oidcauthextension/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/coreos/go-oidc v2.2.1+incompatible github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 ) diff --git a/extension/oidcauthextension/go.sum b/extension/oidcauthextension/go.sum index 319437b51371..b6fe54e56861 100644 --- a/extension/oidcauthextension/go.sum +++ b/extension/oidcauthextension/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.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/extension/pprofextension/go.mod b/extension/pprofextension/go.mod index a98b2ddabacc..c57ec677fefb 100644 --- a/extension/pprofextension/go.mod +++ b/extension/pprofextension/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 ) diff --git a/extension/pprofextension/go.sum b/extension/pprofextension/go.sum index 338e7593a99e..f3900b8e6475 100644 --- a/extension/pprofextension/go.sum +++ b/extension/pprofextension/go.sum @@ -139,8 +139,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/extension/storage/go.mod b/extension/storage/go.mod index d52823dc01d7..1a7a15dbc984 100644 --- a/extension/storage/go.mod +++ b/extension/storage/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 go.etcd.io/bbolt v1.3.6 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 ) diff --git a/extension/storage/go.sum b/extension/storage/go.sum index 399f1b2e09ed..424466441342 100644 --- a/extension/storage/go.sum +++ b/extension/storage/go.sum @@ -232,8 +232,8 @@ github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxt go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/go.mod b/go.mod index fe15b435d1ef..51b54678f3f0 100644 --- a/go.mod +++ b/go.mod @@ -123,7 +123,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.45.1 github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 golang.org/x/sys v0.0.0-20220207234003-57398862261d ) diff --git a/go.sum b/go.sum index 03c88ffc281a..8db521810958 100644 --- a/go.sum +++ b/go.sum @@ -2147,8 +2147,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.39.0/go.mod h1:gS8A27wi+8gM3hrXL+dEjTbrbLxktjHjAwwqI31ELgQ= go.opentelemetry.io/collector/model v0.44.0/go.mod h1:4jo1R8uBDspLCxUGhQ0k3v/EFXFbW7s0AIy3LuGLbcU= go.opentelemetry.io/collector/model v0.45.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= diff --git a/internal/aws/cwlogs/go.mod b/internal/aws/cwlogs/go.mod index 7d13c9ae814d..4273fc4ead22 100644 --- a/internal/aws/cwlogs/go.mod +++ b/internal/aws/cwlogs/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/aws/aws-sdk-go v1.43.4 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 ) diff --git a/internal/aws/cwlogs/go.sum b/internal/aws/cwlogs/go.sum index 23da0ecccf80..f32ebc96bb1b 100644 --- a/internal/aws/cwlogs/go.sum +++ b/internal/aws/cwlogs/go.sum @@ -134,8 +134,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/internal/aws/ecsutil/go.mod b/internal/aws/ecsutil/go.mod index 415a1776dc25..59111e6b3825 100644 --- a/internal/aws/ecsutil/go.mod +++ b/internal/aws/ecsutil/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 ) diff --git a/internal/aws/ecsutil/go.sum b/internal/aws/ecsutil/go.sum index 69b2354f0634..626316d9736a 100644 --- a/internal/aws/ecsutil/go.sum +++ b/internal/aws/ecsutil/go.sum @@ -176,8 +176,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= diff --git a/internal/aws/proxy/go.mod b/internal/aws/proxy/go.mod index 477dfaf20958..39a7cef9a10c 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.43.4 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 ) diff --git a/internal/aws/proxy/go.sum b/internal/aws/proxy/go.sum index 79596037d86e..e39802304f7f 100644 --- a/internal/aws/proxy/go.sum +++ b/internal/aws/proxy/go.sum @@ -29,8 +29,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/internal/coreinternal/go.mod b/internal/coreinternal/go.mod index bc27e2a3a91f..330e70ca825a 100644 --- a/internal/coreinternal/go.mod +++ b/internal/coreinternal/go.mod @@ -8,7 +8,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da github.com/spf13/cast v1.4.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a google.golang.org/protobuf v1.27.1 ) diff --git a/internal/coreinternal/go.sum b/internal/coreinternal/go.sum index 6a83e9f60bba..ec63a083dc07 100644 --- a/internal/coreinternal/go.sum +++ b/internal/coreinternal/go.sum @@ -150,8 +150,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/internal/kubelet/go.mod b/internal/kubelet/go.mod index 7f04cbd7667f..4d0733539f28 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.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 ) diff --git a/internal/kubelet/go.sum b/internal/kubelet/go.sum index 290fe00eba50..8f4863fe4681 100644 --- a/internal/kubelet/go.sum +++ b/internal/kubelet/go.sum @@ -276,8 +276,8 @@ 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.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/internal/sharedcomponent/go.mod b/internal/sharedcomponent/go.mod index 59c0bbad7c0a..f546ee51f7ab 100644 --- a/internal/sharedcomponent/go.mod +++ b/internal/sharedcomponent/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 ) require ( diff --git a/internal/sharedcomponent/go.sum b/internal/sharedcomponent/go.sum index f74debc4ed8d..da5a26a36fc1 100644 --- a/internal/sharedcomponent/go.sum +++ b/internal/sharedcomponent/go.sum @@ -128,8 +128,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index 25ef45c16820..f1f038fc92f2 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 ) diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index ae8d5a92b58c..348ce23e03bb 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -156,8 +156,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/internal/stanza/factory.go b/internal/stanza/factory.go index 8826f4eac965..4ed319854288 100644 --- a/internal/stanza/factory.go +++ b/internal/stanza/factory.go @@ -23,7 +23,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" - "go.opentelemetry.io/collector/receiver/receiverhelper" ) // LogReceiverType is the interface used by stanza-based log receivers @@ -36,14 +35,14 @@ type LogReceiverType interface { // NewFactory creates a factory for a Stanza-based receiver func NewFactory(logReceiverType LogReceiverType) component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( logReceiverType.Type(), logReceiverType.CreateDefaultConfig, - receiverhelper.WithLogs(createLogsReceiver(logReceiverType)), + component.WithLogsReceiver(createLogsReceiver(logReceiverType)), ) } -func createLogsReceiver(logReceiverType LogReceiverType) receiverhelper.CreateLogsReceiver { +func createLogsReceiver(logReceiverType LogReceiverType) component.CreateLogsReceiverFunc { return func( ctx context.Context, params component.ReceiverCreateSettings, diff --git a/internal/stanza/go.mod b/internal/stanza/go.mod index bf46a05e1a80..09574edfe2f5 100644 --- a/internal/stanza/go.mod +++ b/internal/stanza/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.45.1 github.com/open-telemetry/opentelemetry-log-collection v0.25.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.opentelemetry.io/otel/metric v0.27.0 go.opentelemetry.io/otel/trace v1.4.1 diff --git a/internal/stanza/go.sum b/internal/stanza/go.sum index 139e6b04484c..9848b3af82a9 100644 --- a/internal/stanza/go.sum +++ b/internal/stanza/go.sum @@ -204,8 +204,8 @@ go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/pkg/batchperresourceattr/go.mod b/pkg/batchperresourceattr/go.mod index 37844fd35898..dd9d2045c3f4 100644 --- a/pkg/batchperresourceattr/go.mod +++ b/pkg/batchperresourceattr/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 ) diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index 3b66a7772191..3f297ef75dfb 100644 --- a/pkg/batchperresourceattr/go.sum +++ b/pkg/batchperresourceattr/go.sum @@ -24,8 +24,8 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= 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.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/pkg/resourcetotelemetry/go.mod b/pkg/resourcetotelemetry/go.mod index b3970b99ff50..e16378e74d13 100644 --- a/pkg/resourcetotelemetry/go.mod +++ b/pkg/resourcetotelemetry/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a ) diff --git a/pkg/resourcetotelemetry/go.sum b/pkg/resourcetotelemetry/go.sum index 0e295dc37dcd..a5e4f003ff79 100644 --- a/pkg/resourcetotelemetry/go.sum +++ b/pkg/resourcetotelemetry/go.sum @@ -123,8 +123,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/pkg/translator/prometheusremotewrite/go.mod b/pkg/translator/prometheusremotewrite/go.mod index 3fa45be90d5f..b59812c13084 100644 --- a/pkg/translator/prometheusremotewrite/go.mod +++ b/pkg/translator/prometheusremotewrite/go.mod @@ -6,7 +6,7 @@ require ( github.com/prometheus/common v0.32.1 github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 ) diff --git a/pkg/translator/prometheusremotewrite/go.sum b/pkg/translator/prometheusremotewrite/go.sum index bd6d81897f76..b812404f86ea 100644 --- a/pkg/translator/prometheusremotewrite/go.sum +++ b/pkg/translator/prometheusremotewrite/go.sum @@ -1231,8 +1231,8 @@ 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.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= diff --git a/processor/attributesprocessor/factory.go b/processor/attributesprocessor/factory.go index ff127dd9fa74..7f7d0acb005c 100644 --- a/processor/attributesprocessor/factory.go +++ b/processor/attributesprocessor/factory.go @@ -37,11 +37,11 @@ var processorCapabilities = consumer.Capabilities{MutatesData: true} // NewFactory returns a new factory for the Attributes processor. func NewFactory() component.ProcessorFactory { - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithTraces(createTracesProcessor), - processorhelper.WithLogs(createLogProcessor)) + component.WithTracesProcessor(createTracesProcessor), + component.WithLogsProcessor(createLogProcessor)) } // Note: This isn't a valid configuration because the processor would do no work. diff --git a/processor/attributesprocessor/go.mod b/processor/attributesprocessor/go.mod index 753821a5551a..f21dd2f5f0a3 100644 --- a/processor/attributesprocessor/go.mod +++ b/processor/attributesprocessor/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a ) diff --git a/processor/attributesprocessor/go.sum b/processor/attributesprocessor/go.sum index 9708dfe88296..d99da1209cd7 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/go.sum @@ -160,8 +160,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/processor/cumulativetodeltaprocessor/factory.go b/processor/cumulativetodeltaprocessor/factory.go index 9c5f516de850..957e0ae8a472 100644 --- a/processor/cumulativetodeltaprocessor/factory.go +++ b/processor/cumulativetodeltaprocessor/factory.go @@ -33,10 +33,10 @@ var processorCapabilities = consumer.Capabilities{MutatesData: true} // NewFactory returns a new factory for the Metrics Generation processor. func NewFactory() component.ProcessorFactory { - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithMetrics(createMetricsProcessor)) + component.WithMetricsProcessor(createMetricsProcessor)) } func createDefaultConfig() config.Processor { diff --git a/processor/cumulativetodeltaprocessor/go.mod b/processor/cumulativetodeltaprocessor/go.mod index eb10a7e232b0..8daab4dea42c 100644 --- a/processor/cumulativetodeltaprocessor/go.mod +++ b/processor/cumulativetodeltaprocessor/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 diff --git a/processor/cumulativetodeltaprocessor/go.sum b/processor/cumulativetodeltaprocessor/go.sum index 1f743c6435af..fec7cf6cd0a4 100644 --- a/processor/cumulativetodeltaprocessor/go.sum +++ b/processor/cumulativetodeltaprocessor/go.sum @@ -164,8 +164,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/processor/deltatorateprocessor/factory.go b/processor/deltatorateprocessor/factory.go index d559a8419c3c..ab1c95d90b87 100644 --- a/processor/deltatorateprocessor/factory.go +++ b/processor/deltatorateprocessor/factory.go @@ -33,10 +33,10 @@ var processorCapabilities = consumer.Capabilities{MutatesData: true} // NewFactory returns a new factory for the Delta to Rate processor. func NewFactory() component.ProcessorFactory { - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithMetrics(createMetricsProcessor)) + component.WithMetricsProcessor(createMetricsProcessor)) } func createDefaultConfig() config.Processor { diff --git a/processor/deltatorateprocessor/go.mod b/processor/deltatorateprocessor/go.mod index 0edc0cd24ace..921a1a3837d0 100644 --- a/processor/deltatorateprocessor/go.mod +++ b/processor/deltatorateprocessor/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 diff --git a/processor/deltatorateprocessor/go.sum b/processor/deltatorateprocessor/go.sum index 1f743c6435af..fec7cf6cd0a4 100644 --- a/processor/deltatorateprocessor/go.sum +++ b/processor/deltatorateprocessor/go.sum @@ -164,8 +164,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/processor/filterprocessor/factory.go b/processor/filterprocessor/factory.go index 7a5e98a29199..deafa74c0b6b 100644 --- a/processor/filterprocessor/factory.go +++ b/processor/filterprocessor/factory.go @@ -32,11 +32,11 @@ var processorCapabilities = consumer.Capabilities{MutatesData: true} // NewFactory returns a new factory for the Filter processor. func NewFactory() component.ProcessorFactory { - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithMetrics(createMetricsProcessor), - processorhelper.WithLogs(createLogsProcessor), + component.WithMetricsProcessor(createMetricsProcessor), + component.WithLogsProcessor(createLogsProcessor), ) } diff --git a/processor/filterprocessor/go.mod b/processor/filterprocessor/go.mod index 4e389512178c..3dd54cbc9d7f 100644 --- a/processor/filterprocessor/go.mod +++ b/processor/filterprocessor/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/processor/filterprocessor/go.sum b/processor/filterprocessor/go.sum index a63f57bac931..eb868f3b4918 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/go.sum @@ -176,8 +176,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/processor/groupbyattrsprocessor/factory.go b/processor/groupbyattrsprocessor/factory.go index 28303fd5b59e..f2624a7b2e23 100644 --- a/processor/groupbyattrsprocessor/factory.go +++ b/processor/groupbyattrsprocessor/factory.go @@ -46,12 +46,12 @@ func NewFactory() component.ProcessorFactory { _ = view.Register(MetricViews()...) }) - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithTraces(createTracesProcessor), - processorhelper.WithLogs(createLogsProcessor), - processorhelper.WithMetrics(createMetricsProcessor)) + component.WithTracesProcessor(createTracesProcessor), + component.WithLogsProcessor(createLogsProcessor), + component.WithMetricsProcessor(createMetricsProcessor)) } // createDefaultConfig creates the default configuration for the processor. diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index 1d9f35e1f5a4..e9d928e0d7ab 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index 80fbc2469490..ff88c576d727 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -164,8 +164,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/processor/groupbytraceprocessor/factory.go b/processor/groupbytraceprocessor/factory.go index 9a9c744f6950..c30585a972b5 100644 --- a/processor/groupbytraceprocessor/factory.go +++ b/processor/groupbytraceprocessor/factory.go @@ -23,7 +23,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/processor/processorhelper" ) const ( @@ -47,10 +46,10 @@ func NewFactory() component.ProcessorFactory { // TODO: find a more appropriate way to get this done, as we are swallowing the error here _ = view.Register(MetricViews()...) - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithTraces(createTracesProcessor)) + component.WithTracesProcessor(createTracesProcessor)) } // createDefaultConfig creates the default configuration for the processor. diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index a20c8428bb99..a69f19f52e60 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.45.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index 96ca38c6ea67..462cefe778f3 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -154,8 +154,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/processor/k8sattributesprocessor/factory.go b/processor/k8sattributesprocessor/factory.go index 15b1f05ad5f4..0c9fb391088a 100644 --- a/processor/k8sattributesprocessor/factory.go +++ b/processor/k8sattributesprocessor/factory.go @@ -40,12 +40,12 @@ var defaultExcludes = ExcludeConfig{Pods: []ExcludePodConfig{{Name: "jaeger-agen // NewFactory returns a new factory for the k8s processor. func NewFactory() component.ProcessorFactory { - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithTraces(createTracesProcessor), - processorhelper.WithMetrics(createMetricsProcessor), - processorhelper.WithLogs(createLogsProcessor), + component.WithTracesProcessor(createTracesProcessor), + component.WithMetricsProcessor(createMetricsProcessor), + component.WithLogsProcessor(createLogsProcessor), ) } diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index 0a9e1df86b14..bc137ccb2a99 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.45.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 k8s.io/api v0.23.4 diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index 0527c0a24208..b940eb12bcf9 100644 --- a/processor/k8sattributesprocessor/go.sum +++ b/processor/k8sattributesprocessor/go.sum @@ -369,8 +369,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/processor/metricsgenerationprocessor/factory.go b/processor/metricsgenerationprocessor/factory.go index d139af41dda5..e43ac0329bd0 100644 --- a/processor/metricsgenerationprocessor/factory.go +++ b/processor/metricsgenerationprocessor/factory.go @@ -33,10 +33,10 @@ var processorCapabilities = consumer.Capabilities{MutatesData: true} // NewFactory returns a new factory for the Metrics Generation processor. func NewFactory() component.ProcessorFactory { - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithMetrics(createMetricsProcessor)) + component.WithMetricsProcessor(createMetricsProcessor)) } func createDefaultConfig() config.Processor { diff --git a/processor/metricsgenerationprocessor/go.mod b/processor/metricsgenerationprocessor/go.mod index 58393983b11c..1ec1ef99b92b 100644 --- a/processor/metricsgenerationprocessor/go.mod +++ b/processor/metricsgenerationprocessor/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 diff --git a/processor/metricsgenerationprocessor/go.sum b/processor/metricsgenerationprocessor/go.sum index 1f743c6435af..fec7cf6cd0a4 100644 --- a/processor/metricsgenerationprocessor/go.sum +++ b/processor/metricsgenerationprocessor/go.sum @@ -164,8 +164,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/processor/metricstransformprocessor/factory.go b/processor/metricstransformprocessor/factory.go index 10232c43383a..e90ef0d20c79 100644 --- a/processor/metricstransformprocessor/factory.go +++ b/processor/metricstransformprocessor/factory.go @@ -35,10 +35,10 @@ var consumerCapabilities = consumer.Capabilities{MutatesData: true} // NewFactory returns a new factory for the Metrics Transform processor. func NewFactory() component.ProcessorFactory { - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithMetrics(createMetricsProcessor)) + component.WithMetricsProcessor(createMetricsProcessor)) } func createDefaultConfig() config.Processor { diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index 6800413ee363..761fe3c259d9 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -7,7 +7,7 @@ require ( github.com/google/go-cmp v0.5.7 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 google.golang.org/protobuf v1.27.1 diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index 02628aca3e46..3645fd091d5c 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -184,8 +184,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/processor/probabilisticsamplerprocessor/factory.go b/processor/probabilisticsamplerprocessor/factory.go index 1c342eae47ba..71f16f192c03 100644 --- a/processor/probabilisticsamplerprocessor/factory.go +++ b/processor/probabilisticsamplerprocessor/factory.go @@ -20,7 +20,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/processor/processorhelper" ) const ( @@ -30,10 +29,10 @@ const ( // NewFactory returns a new factory for the Probabilistic sampler processor. func NewFactory() component.ProcessorFactory { - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithTraces(createTracesProcessor)) + component.WithTracesProcessor(createTracesProcessor)) } func createDefaultConfig() config.Processor { diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index c7b36521ebd4..c71b04383388 100644 --- a/processor/probabilisticsamplerprocessor/go.mod +++ b/processor/probabilisticsamplerprocessor/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a ) diff --git a/processor/probabilisticsamplerprocessor/go.sum b/processor/probabilisticsamplerprocessor/go.sum index 69dbc2ed23c4..b1efabddb7aa 100644 --- a/processor/probabilisticsamplerprocessor/go.sum +++ b/processor/probabilisticsamplerprocessor/go.sum @@ -159,8 +159,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/processor/redactionprocessor/factory.go b/processor/redactionprocessor/factory.go index 5b3a0657cdac..aaf9c55ad716 100644 --- a/processor/redactionprocessor/factory.go +++ b/processor/redactionprocessor/factory.go @@ -31,10 +31,10 @@ const ( // NewFactory creates a factory for the redaction processor. func NewFactory() component.ProcessorFactory { - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithTraces(createTracesProcessor), + component.WithTracesProcessor(createTracesProcessor), ) } diff --git a/processor/redactionprocessor/go.mod b/processor/redactionprocessor/go.mod index f588f77b57b5..66697b90a98a 100644 --- a/processor/redactionprocessor/go.mod +++ b/processor/redactionprocessor/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/processor/redactionprocessor/go.sum b/processor/redactionprocessor/go.sum index fcd1791e8620..be0d8b2502cf 100644 --- a/processor/redactionprocessor/go.sum +++ b/processor/redactionprocessor/go.sum @@ -165,8 +165,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/processor/resourcedetectionprocessor/factory.go b/processor/resourcedetectionprocessor/factory.go index 73a0c2a948e2..08acf7f710fc 100644 --- a/processor/resourcedetectionprocessor/factory.go +++ b/processor/resourcedetectionprocessor/factory.go @@ -76,12 +76,12 @@ func NewFactory() component.ProcessorFactory { providers: map[config.ComponentID]*internal.ResourceProvider{}, } - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithTraces(f.createTracesProcessor), - processorhelper.WithMetrics(f.createMetricsProcessor), - processorhelper.WithLogs(f.createLogsProcessor)) + component.WithTracesProcessor(f.createTracesProcessor), + component.WithMetricsProcessor(f.createMetricsProcessor), + component.WithLogsProcessor(f.createLogsProcessor)) } // Type gets the type of the Option config created by this factory. diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index 39f5ee0c27e3..38227470949c 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -12,7 +12,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index ed23ca01f1c4..a4897c55c6cb 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -870,8 +870,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/processor/resourceprocessor/factory.go b/processor/resourceprocessor/factory.go index 43d9225ac88c..378e444508d5 100644 --- a/processor/resourceprocessor/factory.go +++ b/processor/resourceprocessor/factory.go @@ -35,12 +35,12 @@ var processorCapabilities = consumer.Capabilities{MutatesData: true} // NewFactory returns a new factory for the Resource processor. func NewFactory() component.ProcessorFactory { - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithTraces(createTracesProcessor), - processorhelper.WithMetrics(createMetricsProcessor), - processorhelper.WithLogs(createLogsProcessor)) + component.WithTracesProcessor(createTracesProcessor), + component.WithMetricsProcessor(createMetricsProcessor), + component.WithLogsProcessor(createLogsProcessor)) } // Note: This isn't a valid configuration because the processor would do no work. diff --git a/processor/resourceprocessor/go.mod b/processor/resourceprocessor/go.mod index 97a3541ca3e9..f73b57af7a06 100644 --- a/processor/resourceprocessor/go.mod +++ b/processor/resourceprocessor/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a ) diff --git a/processor/resourceprocessor/go.sum b/processor/resourceprocessor/go.sum index 69dbc2ed23c4..b1efabddb7aa 100644 --- a/processor/resourceprocessor/go.sum +++ b/processor/resourceprocessor/go.sum @@ -159,8 +159,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/processor/routingprocessor/factory.go b/processor/routingprocessor/factory.go index 84f1873277c9..973b6d10c938 100644 --- a/processor/routingprocessor/factory.go +++ b/processor/routingprocessor/factory.go @@ -20,7 +20,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/processor/processorhelper" "go.uber.org/zap" ) @@ -31,12 +30,12 @@ const ( // NewFactory creates a factory for the routing processor. func NewFactory() component.ProcessorFactory { - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithTraces(createTracesProcessor), - processorhelper.WithMetrics(createMetricsProcessor), - processorhelper.WithLogs(createLogsProcessor), + component.WithTracesProcessor(createTracesProcessor), + component.WithMetricsProcessor(createMetricsProcessor), + component.WithLogsProcessor(createLogsProcessor), ) } diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index 1361f1c50460..97c33b7dc252 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 google.golang.org/grpc v1.44.0 diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index 5177f1bb5504..883dcd31d58a 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -329,8 +329,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/processor/spanmetricsprocessor/factory.go b/processor/spanmetricsprocessor/factory.go index 2b23d792e4dd..bfa7ea486063 100644 --- a/processor/spanmetricsprocessor/factory.go +++ b/processor/spanmetricsprocessor/factory.go @@ -20,7 +20,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/processor/processorhelper" ) const ( @@ -30,10 +29,10 @@ const ( // NewFactory creates a factory for the spanmetrics processor. func NewFactory() component.ProcessorFactory { - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithTraces(createTracesProcessor), + component.WithTracesProcessor(createTracesProcessor), ) } diff --git a/processor/spanmetricsprocessor/go.mod b/processor/spanmetricsprocessor/go.mod index dfc1e66a82dc..0d1347cad1fd 100644 --- a/processor/spanmetricsprocessor/go.mod +++ b/processor/spanmetricsprocessor/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 google.golang.org/grpc v1.44.0 diff --git a/processor/spanmetricsprocessor/go.sum b/processor/spanmetricsprocessor/go.sum index 65576f65c718..d840c6943643 100644 --- a/processor/spanmetricsprocessor/go.sum +++ b/processor/spanmetricsprocessor/go.sum @@ -386,8 +386,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/processor/spanprocessor/factory.go b/processor/spanprocessor/factory.go index 9f5f362cd896..81d70667155d 100644 --- a/processor/spanprocessor/factory.go +++ b/processor/spanprocessor/factory.go @@ -50,10 +50,10 @@ var ( // NewFactory returns a new factory for the Span processor. func NewFactory() component.ProcessorFactory { - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithTraces(createTracesProcessor)) + component.WithTracesProcessor(createTracesProcessor)) } func createDefaultConfig() config.Processor { diff --git a/processor/spanprocessor/go.mod b/processor/spanprocessor/go.mod index 163db61bd680..05ab677aff87 100644 --- a/processor/spanprocessor/go.mod +++ b/processor/spanprocessor/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a ) diff --git a/processor/spanprocessor/go.sum b/processor/spanprocessor/go.sum index 9708dfe88296..d99da1209cd7 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -160,8 +160,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/processor/tailsamplingprocessor/factory.go b/processor/tailsamplingprocessor/factory.go index d6364b658ac5..0f979c7016e1 100644 --- a/processor/tailsamplingprocessor/factory.go +++ b/processor/tailsamplingprocessor/factory.go @@ -24,7 +24,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/processor/processorhelper" ) const ( @@ -41,10 +40,10 @@ func NewFactory() component.ProcessorFactory { _ = view.Register(SamplingProcessorMetricViews(configtelemetry.LevelNormal)...) }) - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithTraces(createTracesProcessor)) + component.WithTracesProcessor(createTracesProcessor)) } func createDefaultConfig() config.Processor { diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index a4d28a4a3a7e..56e24282a8ac 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -7,7 +7,7 @@ require ( github.com/google/uuid v1.3.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index bfb65fa2da78..f6c3994dc78a 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -167,8 +167,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/processor/transformprocessor/factory.go b/processor/transformprocessor/factory.go index 728f62fa3f06..6cacec6a2b98 100644 --- a/processor/transformprocessor/factory.go +++ b/processor/transformprocessor/factory.go @@ -33,10 +33,10 @@ const ( var processorCapabilities = consumer.Capabilities{MutatesData: true} func NewFactory() component.ProcessorFactory { - return processorhelper.NewFactory( + return component.NewProcessorFactory( typeStr, createDefaultConfig, - processorhelper.WithTraces(createTracesProcessor), + component.WithTracesProcessor(createTracesProcessor), ) } diff --git a/processor/transformprocessor/go.mod b/processor/transformprocessor/go.mod index a6a28e35a04f..7cc7b9eb9e04 100644 --- a/processor/transformprocessor/go.mod +++ b/processor/transformprocessor/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/alecthomas/participle/v2 v2.0.0-alpha7 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/processor/transformprocessor/go.sum b/processor/transformprocessor/go.sum index 038ab754b003..313023485b6b 100644 --- a/processor/transformprocessor/go.sum +++ b/processor/transformprocessor/go.sum @@ -169,8 +169,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/apachereceiver/factory.go b/receiver/apachereceiver/factory.go index dd287cdb20e2..e3e2ba9923a8 100644 --- a/receiver/apachereceiver/factory.go +++ b/receiver/apachereceiver/factory.go @@ -22,7 +22,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver/internal/metadata" @@ -32,10 +31,10 @@ const typeStr = "apache" // NewFactory creates a factory for apache receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index 94300482c8d2..48109c3793b0 100644 --- a/receiver/apachereceiver/go.mod +++ b/receiver/apachereceiver/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/receiver/apachereceiver/go.sum b/receiver/apachereceiver/go.sum index 90a4f3d3ad21..63c23f0c3c2e 100644 --- a/receiver/apachereceiver/go.sum +++ b/receiver/apachereceiver/go.sum @@ -672,8 +672,8 @@ 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= diff --git a/receiver/awscontainerinsightreceiver/factory.go b/receiver/awscontainerinsightreceiver/factory.go index aeb338a0c170..f03783ad9496 100644 --- a/receiver/awscontainerinsightreceiver/factory.go +++ b/receiver/awscontainerinsightreceiver/factory.go @@ -21,7 +21,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" ) // Factory for awscontainerinsightreceiver @@ -47,10 +46,10 @@ const ( // NewFactory creates a factory for AWS container insight receiver func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } // createDefaultConfig returns a default config for the receiver. diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index 2b6deded85e9..f76044489354 100644 --- a/receiver/awscontainerinsightreceiver/go.mod +++ b/receiver/awscontainerinsightreceiver/go.mod @@ -13,7 +13,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.45.1 github.com/shirou/gopsutil/v3 v3.22.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 k8s.io/api v0.23.4 diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index 07c1c79b1b47..dab5db37ca12 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -852,8 +852,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/awsecscontainermetricsreceiver/factory.go b/receiver/awsecscontainermetricsreceiver/factory.go index 5faddd133574..a871bc1ff468 100644 --- a/receiver/awsecscontainermetricsreceiver/factory.go +++ b/receiver/awsecscontainermetricsreceiver/factory.go @@ -23,7 +23,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil/endpoints" @@ -40,10 +39,10 @@ const ( // NewFactory creates a factory for AWS ECS Container Metrics receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } // createDefaultConfig returns a default config for the receiver. diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index 9c0962a4a6cc..b4fdeefbaf84 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index c180ae2ba1a9..a1e92eb082eb 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -174,8 +174,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/awsfirehosereceiver/factory.go b/receiver/awsfirehosereceiver/factory.go index 31dc7e92c0e3..9069dd0fc6e1 100644 --- a/receiver/awsfirehosereceiver/factory.go +++ b/receiver/awsfirehosereceiver/factory.go @@ -22,7 +22,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsfirehosereceiver/internal/unmarshaler" @@ -45,10 +44,10 @@ var ( // NewFactory creates a receiver factory for awsfirehose. Currently, only // available in metrics pipelines. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } // validateRecordType checks the available record types for the diff --git a/receiver/awsfirehosereceiver/go.mod b/receiver/awsfirehosereceiver/go.mod index c5fcdaf5ea27..058e012367e3 100644 --- a/receiver/awsfirehosereceiver/go.mod +++ b/receiver/awsfirehosereceiver/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/receiver/awsfirehosereceiver/go.sum b/receiver/awsfirehosereceiver/go.sum index d3396beb1f05..3ce063c00f6b 100644 --- a/receiver/awsfirehosereceiver/go.sum +++ b/receiver/awsfirehosereceiver/go.sum @@ -181,8 +181,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/awsxrayreceiver/factory.go b/receiver/awsxrayreceiver/factory.go index 0084074baadf..d05fb8ea0a53 100644 --- a/receiver/awsxrayreceiver/factory.go +++ b/receiver/awsxrayreceiver/factory.go @@ -21,7 +21,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy" awsxray "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray" @@ -30,10 +29,10 @@ import ( // NewFactory creates a factory for AWS receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( awsxray.TypeStr, createDefaultConfig, - receiverhelper.WithTraces(createTracesReceiver)) + component.WithTracesReceiver(createTracesReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index f6a20140d121..d8ece68fbaee 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index f977901c8bdb..6302724d6bf6 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -164,8 +164,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/carbonreceiver/factory.go b/receiver/carbonreceiver/factory.go index 25f408bfa73c..b9c6180172ee 100644 --- a/receiver/carbonreceiver/factory.go +++ b/receiver/carbonreceiver/factory.go @@ -21,7 +21,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/protocol" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/transport" @@ -36,10 +35,10 @@ const ( // NewFactory creates a factory for Carbon receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index 5b7afbeac5e6..0087bac7cfad 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.45.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 google.golang.org/protobuf v1.27.1 diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index 540d170b8275..91ee5e267ed5 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -163,8 +163,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/cloudfoundryreceiver/factory.go b/receiver/cloudfoundryreceiver/factory.go index f65df050c0b9..6e0580ba9660 100644 --- a/receiver/cloudfoundryreceiver/factory.go +++ b/receiver/cloudfoundryreceiver/factory.go @@ -22,7 +22,6 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" ) // This file implements factory for Cloud Foundry receiver. @@ -36,10 +35,10 @@ const ( // NewFactory creates a factory for collectd receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/cloudfoundryreceiver/go.mod b/receiver/cloudfoundryreceiver/go.mod index 9439bae6682e..170f8ca6f6f5 100644 --- a/receiver/cloudfoundryreceiver/go.mod +++ b/receiver/cloudfoundryreceiver/go.mod @@ -6,7 +6,7 @@ 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.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/receiver/cloudfoundryreceiver/go.sum b/receiver/cloudfoundryreceiver/go.sum index e2c3ee0f32c0..e063983f4947 100644 --- a/receiver/cloudfoundryreceiver/go.sum +++ b/receiver/cloudfoundryreceiver/go.sum @@ -217,8 +217,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/collectdreceiver/factory.go b/receiver/collectdreceiver/factory.go index 204c2a770c02..0af04b536148 100644 --- a/receiver/collectdreceiver/factory.go +++ b/receiver/collectdreceiver/factory.go @@ -24,7 +24,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" ) // This file implements factory for CollectD receiver. @@ -38,10 +37,10 @@ const ( // NewFactory creates a factory for collectd receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { return &Config{ diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index ec290e53a465..fcef54591c0d 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.45.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 google.golang.org/protobuf v1.27.1 ) diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index 02628aca3e46..3645fd091d5c 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -184,8 +184,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/couchbasereceiver/factory.go b/receiver/couchbasereceiver/factory.go index fa76c1725d2a..0cea44cb459e 100644 --- a/receiver/couchbasereceiver/factory.go +++ b/receiver/couchbasereceiver/factory.go @@ -22,7 +22,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -30,10 +29,10 @@ const typeStr = "couchbase" // NewFactory creates a new receiver factory func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/couchbasereceiver/go.mod b/receiver/couchbasereceiver/go.mod index 4c3d831a2ea8..1c6c75330fba 100644 --- a/receiver/couchbasereceiver/go.mod +++ b/receiver/couchbasereceiver/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/multierr v1.7.0 ) diff --git a/receiver/couchbasereceiver/go.sum b/receiver/couchbasereceiver/go.sum index f43ffeee4cf7..219dfc6eb4c7 100644 --- a/receiver/couchbasereceiver/go.sum +++ b/receiver/couchbasereceiver/go.sum @@ -182,8 +182,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= diff --git a/receiver/couchdbreceiver/factory.go b/receiver/couchdbreceiver/factory.go index 2312ff1773b1..a541c7a45b6b 100644 --- a/receiver/couchdbreceiver/factory.go +++ b/receiver/couchdbreceiver/factory.go @@ -23,7 +23,6 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -32,10 +31,10 @@ const ( ) func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/couchdbreceiver/go.mod b/receiver/couchdbreceiver/go.mod index b793da547d0e..f131eefe87de 100644 --- a/receiver/couchdbreceiver/go.mod +++ b/receiver/couchdbreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchd go 1.17 require ( - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/multierr v1.7.0 ) diff --git a/receiver/couchdbreceiver/go.sum b/receiver/couchdbreceiver/go.sum index 2bf1f8498a1e..cc3e11192fb9 100644 --- a/receiver/couchdbreceiver/go.sum +++ b/receiver/couchdbreceiver/go.sum @@ -183,8 +183,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= diff --git a/receiver/dockerstatsreceiver/factory.go b/receiver/dockerstatsreceiver/factory.go index bd476a8b0695..4a379c99043a 100644 --- a/receiver/dockerstatsreceiver/factory.go +++ b/receiver/dockerstatsreceiver/factory.go @@ -21,7 +21,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -30,10 +29,10 @@ const ( ) func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index 11fd71798aa9..5c5ed69d4936 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index 3dfd877ca87c..45b866bf4f5b 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -709,8 +709,8 @@ 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/dotnetdiagnosticsreceiver/factory.go b/receiver/dotnetdiagnosticsreceiver/factory.go index f64f6f22cc06..a1267ba90e0d 100644 --- a/receiver/dotnetdiagnosticsreceiver/factory.go +++ b/receiver/dotnetdiagnosticsreceiver/factory.go @@ -25,7 +25,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver/network" @@ -34,10 +33,10 @@ import ( const typeStr = "dotnet_diagnostics" func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver), + component.WithMetricsReceiver(createMetricsReceiver), ) } diff --git a/receiver/dotnetdiagnosticsreceiver/go.mod b/receiver/dotnetdiagnosticsreceiver/go.mod index 8dc745a5ac6b..41f18289eed4 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.mod +++ b/receiver/dotnetdiagnosticsreceiver/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/receiver/dotnetdiagnosticsreceiver/go.sum b/receiver/dotnetdiagnosticsreceiver/go.sum index 80fbc2469490..ff88c576d727 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.sum +++ b/receiver/dotnetdiagnosticsreceiver/go.sum @@ -164,8 +164,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/elasticsearchreceiver/factory.go b/receiver/elasticsearchreceiver/factory.go index ff3ecf60d8fb..8eef77a0b25a 100644 --- a/receiver/elasticsearchreceiver/factory.go +++ b/receiver/elasticsearchreceiver/factory.go @@ -23,7 +23,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver/internal/metadata" @@ -37,10 +36,10 @@ const ( // NewFactory creates a factory for elasticsearch receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } // createDefaultConfig creates the default elasticsearchreceiver config. diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod index 245ad8ef6a19..dda93b768d19 100644 --- a/receiver/elasticsearchreceiver/go.mod +++ b/receiver/elasticsearchreceiver/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/receiver/elasticsearchreceiver/go.sum b/receiver/elasticsearchreceiver/go.sum index aadda373f72a..e2b2f2236581 100644 --- a/receiver/elasticsearchreceiver/go.sum +++ b/receiver/elasticsearchreceiver/go.sum @@ -188,8 +188,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 063d4185b2de..daf928dd97bd 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.45.1 github.com/open-telemetry/opentelemetry-log-collection v0.25.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a gopkg.in/yaml.v2 v2.4.0 ) diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index a407de8ce722..b8900947acee 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -213,8 +213,8 @@ go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/fluentforwardreceiver/factory.go b/receiver/fluentforwardreceiver/factory.go index ae1c1157da3f..3eec377ee3e2 100644 --- a/receiver/fluentforwardreceiver/factory.go +++ b/receiver/fluentforwardreceiver/factory.go @@ -20,7 +20,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" ) const ( @@ -30,10 +29,10 @@ const ( // NewFactory return a new component.ReceiverFactory for fluentd forwarder. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithLogs(createLogsReceiver)) + component.WithLogsReceiver(createLogsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/fluentforwardreceiver/go.mod b/receiver/fluentforwardreceiver/go.mod index 2d7b5d3801df..d9d31cbad7c5 100644 --- a/receiver/fluentforwardreceiver/go.mod +++ b/receiver/fluentforwardreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/stretchr/testify v1.7.0 github.com/tinylib/msgp v1.1.6 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 diff --git a/receiver/fluentforwardreceiver/go.sum b/receiver/fluentforwardreceiver/go.sum index b657ddd612ff..81f0bdd8de37 100644 --- a/receiver/fluentforwardreceiver/go.sum +++ b/receiver/fluentforwardreceiver/go.sum @@ -168,8 +168,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/googlecloudpubsubreceiver/factory.go b/receiver/googlecloudpubsubreceiver/factory.go index 363da3707e5b..892da11e71d1 100644 --- a/receiver/googlecloudpubsubreceiver/factory.go +++ b/receiver/googlecloudpubsubreceiver/factory.go @@ -23,7 +23,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" - "go.opentelemetry.io/collector/receiver/receiverhelper" ) const ( @@ -35,12 +34,12 @@ func NewFactory() component.ReceiverFactory { f := &pubsubReceiverFactory{ receivers: make(map[*Config]*pubsubReceiver), } - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, f.CreateDefaultConfig, - receiverhelper.WithTraces(f.CreateTracesReceiver), - receiverhelper.WithMetrics(f.CreateMetricsReceiver), - receiverhelper.WithLogs(f.CreateLogsReceiver), + component.WithTracesReceiver(f.CreateTracesReceiver), + component.WithMetricsReceiver(f.CreateMetricsReceiver), + component.WithLogsReceiver(f.CreateLogsReceiver), ) } diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index f18fc78b58be..138e886ba4f3 100644 --- a/receiver/googlecloudpubsubreceiver/go.mod +++ b/receiver/googlecloudpubsubreceiver/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 ) diff --git a/receiver/googlecloudpubsubreceiver/go.sum b/receiver/googlecloudpubsubreceiver/go.sum index ae8ca057c10f..14a60bd30a7c 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -165,8 +165,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/googlecloudspannerreceiver/factory.go b/receiver/googlecloudspannerreceiver/factory.go index f80dd2ff8f44..cc966c781194 100644 --- a/receiver/googlecloudspannerreceiver/factory.go +++ b/receiver/googlecloudspannerreceiver/factory.go @@ -21,7 +21,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -34,10 +33,10 @@ const ( ) func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index 2cb86bf19cda..c544cb3f31f1 100644 --- a/receiver/googlecloudspannerreceiver/go.mod +++ b/receiver/googlecloudspannerreceiver/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( cloud.google.com/go/spanner v1.29.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 google.golang.org/api v0.68.0 diff --git a/receiver/googlecloudspannerreceiver/go.sum b/receiver/googlecloudspannerreceiver/go.sum index c07e9464104d..8185d5ff9ff1 100644 --- a/receiver/googlecloudspannerreceiver/go.sum +++ b/receiver/googlecloudspannerreceiver/go.sum @@ -334,8 +334,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/hostmetricsreceiver/factory.go b/receiver/hostmetricsreceiver/factory.go index 29676f74e87c..be080fcbdf35 100644 --- a/receiver/hostmetricsreceiver/factory.go +++ b/receiver/hostmetricsreceiver/factory.go @@ -24,7 +24,6 @@ import ( "go.opentelemetry.io/collector/consumer/consumerhelper" "go.opentelemetry.io/collector/model/pdata" conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" @@ -63,10 +62,10 @@ var ( // NewFactory creates a new factory for host metrics receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func getScraperFactory(key string) (internal.ScraperFactory, bool) { diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index a2270f8b3d48..0d0ae9a01084 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1 github.com/shirou/gopsutil/v3 v3.22.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 diff --git a/receiver/hostmetricsreceiver/go.sum b/receiver/hostmetricsreceiver/go.sum index e89b92f62c3a..0d9f2383d731 100644 --- a/receiver/hostmetricsreceiver/go.sum +++ b/receiver/hostmetricsreceiver/go.sum @@ -199,8 +199,8 @@ github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPR github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/influxdbreceiver/factory.go b/receiver/influxdbreceiver/factory.go index 474870183bf1..e4daf329cb13 100644 --- a/receiver/influxdbreceiver/factory.go +++ b/receiver/influxdbreceiver/factory.go @@ -21,7 +21,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" ) const ( @@ -29,10 +28,10 @@ const ( ) func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } // createDefaultConfig creates the default configuration for receiver. diff --git a/receiver/influxdbreceiver/go.mod b/receiver/influxdbreceiver/go.mod index 5dd8c5cfbbe9..3260210bb9b3 100644 --- a/receiver/influxdbreceiver/go.mod +++ b/receiver/influxdbreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/influxdata/influxdb-observability/influx2otel v0.2.10 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.45.1 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/zap v1.21.0 ) diff --git a/receiver/influxdbreceiver/go.sum b/receiver/influxdbreceiver/go.sum index f6eaaafc191f..07b3b608aa27 100644 --- a/receiver/influxdbreceiver/go.sum +++ b/receiver/influxdbreceiver/go.sum @@ -194,8 +194,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.39.0/go.mod h1:gS8A27wi+8gM3hrXL+dEjTbrbLxktjHjAwwqI31ELgQ= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= diff --git a/receiver/jaegerreceiver/factory.go b/receiver/jaegerreceiver/factory.go index 1cedc75b503e..a05936cf0055 100644 --- a/receiver/jaegerreceiver/factory.go +++ b/receiver/jaegerreceiver/factory.go @@ -28,7 +28,6 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" ) const ( @@ -50,10 +49,10 @@ const ( // NewFactory creates a new Jaeger receiver factory. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithTraces(createTracesReceiver)) + component.WithTracesReceiver(createTracesReceiver)) } // CreateDefaultConfig creates the default configuration for Jaeger receiver. diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index 57ef89a8d27f..39fee4673e09 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -10,7 +10,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.45.1 github.com/stretchr/testify v1.7.0 github.com/uber/jaeger-lib v2.4.1+incompatible - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/receiver/jaegerreceiver/go.sum b/receiver/jaegerreceiver/go.sum index d3198c58c169..29e1b345b7a9 100644 --- a/receiver/jaegerreceiver/go.sum +++ b/receiver/jaegerreceiver/go.sum @@ -246,8 +246,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/jmxreceiver/factory.go b/receiver/jmxreceiver/factory.go index ddeea995d715..2a69cea8acc3 100644 --- a/receiver/jmxreceiver/factory.go +++ b/receiver/jmxreceiver/factory.go @@ -22,7 +22,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/exporter/exporterhelper" - "go.opentelemetry.io/collector/receiver/receiverhelper" ) const ( @@ -31,10 +30,10 @@ const ( ) func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createReceiver)) + component.WithMetricsReceiver(createReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index 85b192062d03..019447cdc12a 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/shirou/gopsutil/v3 v3.22.1 github.com/stretchr/testify v1.7.0 github.com/testcontainers/testcontainers-go v0.12.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/atomic v1.9.0 go.uber.org/zap v1.21.0 diff --git a/receiver/jmxreceiver/go.sum b/receiver/jmxreceiver/go.sum index f616f8def5f4..c4e3e2ee136c 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -820,8 +820,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/journaldreceiver/go.mod b/receiver/journaldreceiver/go.mod index f77b23a5078d..b760310fe27d 100644 --- a/receiver/journaldreceiver/go.mod +++ b/receiver/journaldreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.45.1 github.com/open-telemetry/opentelemetry-log-collection v0.25.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum index e87ef8700c16..f08f5573f4a6 100644 --- a/receiver/journaldreceiver/go.sum +++ b/receiver/journaldreceiver/go.sum @@ -208,8 +208,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/journaldreceiver/journald_nonlinux.go b/receiver/journaldreceiver/journald_nonlinux.go index 3c0147647013..99451cb59f91 100644 --- a/receiver/journaldreceiver/journald_nonlinux.go +++ b/receiver/journaldreceiver/journald_nonlinux.go @@ -24,7 +24,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza" ) @@ -33,10 +32,10 @@ const typeStr = "journald" // NewFactory creates a dummy factory. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithLogs(createLogsReceiver)) + component.WithLogsReceiver(createLogsReceiver)) } type JournaldConfig struct { diff --git a/receiver/k8sclusterreceiver/factory.go b/receiver/k8sclusterreceiver/factory.go index f1fc01afd5bc..5a23d44b9cc1 100644 --- a/receiver/k8sclusterreceiver/factory.go +++ b/receiver/k8sclusterreceiver/factory.go @@ -23,7 +23,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" ) @@ -83,8 +82,8 @@ func createMetricsReceiver( // NewFactory creates a factory for k8s_cluster receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 931d3914e670..4b3b460bf021 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -12,7 +12,7 @@ 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.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/atomic v1.9.0 go.uber.org/zap v1.21.0 diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index 6a288505ab4f..fcdccea698ac 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -383,8 +383,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/k8seventsreceiver/factory.go b/receiver/k8seventsreceiver/factory.go index d27090dc5b6d..158cd039f8d6 100644 --- a/receiver/k8seventsreceiver/factory.go +++ b/receiver/k8seventsreceiver/factory.go @@ -20,7 +20,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" ) @@ -32,10 +31,10 @@ const ( // NewFactory creates a factory for k8s_cluster receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithLogs(createLogsReceiver)) + component.WithLogsReceiver(createLogsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/k8seventsreceiver/go.mod b/receiver/k8seventsreceiver/go.mod index abe665f8da9b..acbe4da1af23 100644 --- a/receiver/k8seventsreceiver/go.mod +++ b/receiver/k8seventsreceiver/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 k8s.io/api v0.23.4 diff --git a/receiver/k8seventsreceiver/go.sum b/receiver/k8seventsreceiver/go.sum index 6cc5da711d24..28529355122c 100644 --- a/receiver/k8seventsreceiver/go.sum +++ b/receiver/k8seventsreceiver/go.sum @@ -367,8 +367,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/kafkametricsreceiver/factory.go b/receiver/kafkametricsreceiver/factory.go index 00153e4109a1..6d8a33dadfd2 100644 --- a/receiver/kafkametricsreceiver/factory.go +++ b/receiver/kafkametricsreceiver/factory.go @@ -20,7 +20,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -34,10 +33,10 @@ const ( // NewFactory creates kafkametrics receiver factory. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index 67ce275887ae..8cede6140c12 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/receiver/kafkametricsreceiver/go.sum b/receiver/kafkametricsreceiver/go.sum index 5f8b8c0279f6..154dcda8e16b 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -766,8 +766,8 @@ 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/kafkareceiver/factory.go b/receiver/kafkareceiver/factory.go index 2be5091c5200..082984971468 100644 --- a/receiver/kafkareceiver/factory.go +++ b/receiver/kafkareceiver/factory.go @@ -22,7 +22,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" ) @@ -91,12 +90,12 @@ func NewFactory(options ...FactoryOption) component.ReceiverFactory { for _, o := range options { o(f) } - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithTraces(f.createTracesReceiver), - receiverhelper.WithMetrics(f.createMetricsReceiver), - receiverhelper.WithLogs(f.createLogsReceiver), + component.WithTracesReceiver(f.createTracesReceiver), + component.WithMetricsReceiver(f.createMetricsReceiver), + component.WithLogsReceiver(f.createLogsReceiver), ) } diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index 811e8133e38b..e98533b01be8 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -14,7 +14,7 @@ require ( github.com/openzipkin/zipkin-go v0.4.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index 30dd0339818e..2abe24b69636 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -270,8 +270,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/kubeletstatsreceiver/factory.go b/receiver/kubeletstatsreceiver/factory.go index dabe51def7a3..21299debc87d 100644 --- a/receiver/kubeletstatsreceiver/factory.go +++ b/receiver/kubeletstatsreceiver/factory.go @@ -21,7 +21,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" @@ -43,10 +42,10 @@ var defaultMetricGroups = []kubelet.MetricGroup{ // NewFactory creates a factory for kubeletstats receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 0ab3e2dde0e6..867d6a7db374 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 k8s.io/api v0.23.4 diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index cf1a2f953f64..c61651723dee 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -477,8 +477,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0= diff --git a/receiver/memcachedreceiver/factory.go b/receiver/memcachedreceiver/factory.go index 4b3828389d99..a90e2f701240 100644 --- a/receiver/memcachedreceiver/factory.go +++ b/receiver/memcachedreceiver/factory.go @@ -24,7 +24,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -34,10 +33,10 @@ const ( // NewFactory creates a factory for memcached receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index 161dc8013518..091a73a464b3 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/receiver/memcachedreceiver/go.sum b/receiver/memcachedreceiver/go.sum index 142ce18db12c..5e43eda5ac13 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -702,8 +702,8 @@ 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/receiver/mongodbatlasreceiver/factory.go b/receiver/mongodbatlasreceiver/factory.go index e61655b2de54..b1f49346b0d8 100644 --- a/receiver/mongodbatlasreceiver/factory.go +++ b/receiver/mongodbatlasreceiver/factory.go @@ -22,7 +22,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/exporter/exporterhelper" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -33,10 +32,10 @@ const ( // NewFactory creates a factory for MongoDB Atlas receiver func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createMetricsReceiver( diff --git a/receiver/mongodbatlasreceiver/go.mod b/receiver/mongodbatlasreceiver/go.mod index 8207545bfc43..22d75f9fffeb 100644 --- a/receiver/mongodbatlasreceiver/go.mod +++ b/receiver/mongodbatlasreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/mongodb-forks/digest v1.0.3 github.com/pkg/errors v0.9.1 go.mongodb.org/atlas v0.15.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index 0e3f0d8bcbff..9db6cfe3737b 100644 --- a/receiver/mongodbatlasreceiver/go.sum +++ b/receiver/mongodbatlasreceiver/go.sum @@ -162,8 +162,8 @@ go.mongodb.org/atlas v0.15.0 h1:YyOBdBIuI//krRITf4r7PSirJ3YDNNUfNmapxwSyDow= go.mongodb.org/atlas v0.15.0/go.mod h1:lQhRHIxc6jQHEK3/q9WLu/SdBkPj2fQYhjLGUF6Z3U8= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/receiver/mongodbreceiver/factory.go b/receiver/mongodbreceiver/factory.go index 0429ad1c5a30..77a70f915c1f 100644 --- a/receiver/mongodbreceiver/factory.go +++ b/receiver/mongodbreceiver/factory.go @@ -23,7 +23,6 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver/internal/metadata" @@ -35,10 +34,10 @@ const ( // NewFactory creates a factory for mongodb receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/mongodbreceiver/go.mod b/receiver/mongodbreceiver/go.mod index ca8a4cfc2d35..157100c6c3bc 100644 --- a/receiver/mongodbreceiver/go.mod +++ b/receiver/mongodbreceiver/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 ) diff --git a/receiver/mongodbreceiver/go.sum b/receiver/mongodbreceiver/go.sum index 252d5dc5d91d..5fc67c8e82f4 100644 --- a/receiver/mongodbreceiver/go.sum +++ b/receiver/mongodbreceiver/go.sum @@ -179,8 +179,8 @@ go.mongodb.org/mongo-driver v1.8.3 h1:TDKlTkGDKm9kkJVUOAXDK5/fkqKHJVwYQSpoRfB43R go.mongodb.org/mongo-driver v1.8.3/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/receiver/mysqlreceiver/factory.go b/receiver/mysqlreceiver/factory.go index b6a30f41da71..70ce054c8026 100644 --- a/receiver/mysqlreceiver/factory.go +++ b/receiver/mysqlreceiver/factory.go @@ -22,7 +22,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver/internal/metadata" @@ -33,10 +32,10 @@ const ( ) func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index 883e45e884b1..883ee65a6bb5 100644 --- a/receiver/mysqlreceiver/go.mod +++ b/receiver/mysqlreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/go-sql-driver/mysql v1.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/receiver/mysqlreceiver/go.sum b/receiver/mysqlreceiver/go.sum index 3ee831275f50..fbc50f1a65d7 100644 --- a/receiver/mysqlreceiver/go.sum +++ b/receiver/mysqlreceiver/go.sum @@ -724,8 +724,8 @@ 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/receiver/nginxreceiver/factory.go b/receiver/nginxreceiver/factory.go index 9fb9de5b10cb..6d0bce02e104 100644 --- a/receiver/nginxreceiver/factory.go +++ b/receiver/nginxreceiver/factory.go @@ -22,7 +22,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver/internal/metadata" @@ -34,10 +33,10 @@ const ( // NewFactory creates a factory for nginx receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 43879e3c4a86..a05449432461 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.45.1 github.com/stretchr/testify v1.7.0 github.com/testcontainers/testcontainers-go v0.12.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index 6088afaa305f..dccbf24a80a7 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -742,8 +742,8 @@ 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= diff --git a/receiver/opencensusreceiver/factory.go b/receiver/opencensusreceiver/factory.go index f8829cdc2d87..4692dab07b03 100644 --- a/receiver/opencensusreceiver/factory.go +++ b/receiver/opencensusreceiver/factory.go @@ -22,7 +22,6 @@ import ( "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent" ) @@ -31,11 +30,11 @@ const typeStr = "opencensus" // NewFactory creates a new OpenCensus receiver factory. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithTraces(createTracesReceiver), - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithTracesReceiver(createTracesReceiver), + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index 833fb3ae45d1..dd4ad2dec74c 100644 --- a/receiver/opencensusreceiver/go.mod +++ b/receiver/opencensusreceiver/go.mod @@ -12,7 +12,7 @@ require ( github.com/rs/cors v1.8.2 github.com/soheilhy/cmux v0.1.5 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 go.opentelemetry.io/otel v1.4.1 diff --git a/receiver/opencensusreceiver/go.sum b/receiver/opencensusreceiver/go.sum index e9c46f97973f..5f42770e9ddd 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -321,8 +321,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/podmanreceiver/factory.go b/receiver/podmanreceiver/factory.go index a96738dcbef0..4953b67f6404 100644 --- a/receiver/podmanreceiver/factory.go +++ b/receiver/podmanreceiver/factory.go @@ -21,7 +21,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -31,10 +30,10 @@ const ( ) func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultReceiverConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() *Config { diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index b70e3bfb9ecc..00a1aac252dc 100644 --- a/receiver/podmanreceiver/go.mod +++ b/receiver/podmanreceiver/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 diff --git a/receiver/podmanreceiver/go.sum b/receiver/podmanreceiver/go.sum index ac7f6a5b8741..c994f747688f 100644 --- a/receiver/podmanreceiver/go.sum +++ b/receiver/podmanreceiver/go.sum @@ -164,8 +164,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/postgresqlreceiver/factory.go b/receiver/postgresqlreceiver/factory.go index 8d2bc561df01..916ca54f6fa9 100644 --- a/receiver/postgresqlreceiver/factory.go +++ b/receiver/postgresqlreceiver/factory.go @@ -23,7 +23,6 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver/internal/metadata" @@ -34,10 +33,10 @@ const ( ) func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/postgresqlreceiver/go.mod b/receiver/postgresqlreceiver/go.mod index a5cd01977a9a..409b2144deed 100644 --- a/receiver/postgresqlreceiver/go.mod +++ b/receiver/postgresqlreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/lib/pq v1.10.4 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 ) diff --git a/receiver/postgresqlreceiver/go.sum b/receiver/postgresqlreceiver/go.sum index 26c16287ea2f..7c7d353ef5b9 100644 --- a/receiver/postgresqlreceiver/go.sum +++ b/receiver/postgresqlreceiver/go.sum @@ -667,8 +667,8 @@ 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/receiver/prometheusexecreceiver/factory.go b/receiver/prometheusexecreceiver/factory.go index 218f8a2d9a3e..ce4754d9c7a2 100644 --- a/receiver/prometheusexecreceiver/factory.go +++ b/receiver/prometheusexecreceiver/factory.go @@ -21,7 +21,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver/subprocessmanager" ) @@ -37,10 +36,10 @@ const ( // NewFactory creates a factory for the prometheusexec receiver func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } // createDefaultConfig returns a default config diff --git a/receiver/prometheusexecreceiver/go.mod b/receiver/prometheusexecreceiver/go.mod index c6ca115ac651..2940bd8553ac 100644 --- a/receiver/prometheusexecreceiver/go.mod +++ b/receiver/prometheusexecreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/prometheus/common v0.32.1 github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/receiver/prometheusexecreceiver/go.sum b/receiver/prometheusexecreceiver/go.sum index 0bb84421729c..4ef5365e40d3 100644 --- a/receiver/prometheusexecreceiver/go.sum +++ b/receiver/prometheusexecreceiver/go.sum @@ -1432,8 +1432,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/prometheusreceiver/factory.go b/receiver/prometheusreceiver/factory.go index 9b12bd686717..7d379412e431 100644 --- a/receiver/prometheusreceiver/factory.go +++ b/receiver/prometheusreceiver/factory.go @@ -22,7 +22,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" ) // This file implements config for Prometheus receiver. @@ -35,10 +34,10 @@ var errRenamingDisallowed = errors.New("metric renaming using metric_relabel_con // NewFactory creates a new Prometheus receiver factory. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index f516b48a4a06..e98635430b4b 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -10,7 +10,7 @@ require ( github.com/prometheus/common v0.32.1 github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 google.golang.org/protobuf v1.27.1 diff --git a/receiver/prometheusreceiver/go.sum b/receiver/prometheusreceiver/go.sum index 153a3414ae01..dbf560574148 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -1463,8 +1463,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/rabbitmqreceiver/factory.go b/receiver/rabbitmqreceiver/factory.go index 99ee3b115213..41aec441f58f 100644 --- a/receiver/rabbitmqreceiver/factory.go +++ b/receiver/rabbitmqreceiver/factory.go @@ -23,7 +23,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver/internal/metadata" @@ -35,10 +34,10 @@ var errConfigNotRabbit = errors.New("config was not a RabbitMQ receiver config") // NewFactory creates a new receiver factory func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/rabbitmqreceiver/go.mod b/receiver/rabbitmqreceiver/go.mod index e7103ee6a797..d713b691a2f0 100644 --- a/receiver/rabbitmqreceiver/go.mod +++ b/receiver/rabbitmqreceiver/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/receiver/rabbitmqreceiver/go.sum b/receiver/rabbitmqreceiver/go.sum index 2bf1f8498a1e..cc3e11192fb9 100644 --- a/receiver/rabbitmqreceiver/go.sum +++ b/receiver/rabbitmqreceiver/go.sum @@ -183,8 +183,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 h1:SLme4Porm+UwX0DdHMxlwRt7FzPSE0sys81bet2o0pU= diff --git a/receiver/receivercreator/factory.go b/receiver/receivercreator/factory.go index 4bb478ffdece..4709e186850a 100644 --- a/receiver/receivercreator/factory.go +++ b/receiver/receivercreator/factory.go @@ -21,7 +21,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1" - "go.opentelemetry.io/collector/receiver/receiverhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer" ) @@ -34,10 +33,10 @@ const ( // NewFactory creates a factory for receiver creator. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index f03ff050a0c5..acdb98a26c48 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.45.1 github.com/spf13/cast v1.4.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index 1e84d6ba1656..a50e7cf0b05d 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -181,8 +181,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/redisreceiver/factory.go b/receiver/redisreceiver/factory.go index f2a433b0ef05..e1c2f3bb5108 100644 --- a/receiver/redisreceiver/factory.go +++ b/receiver/redisreceiver/factory.go @@ -23,7 +23,6 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver/internal/metadata" @@ -35,10 +34,10 @@ const ( // NewFactory creates a factory for Redis receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index 8341347a1fe6..16e48d832e5e 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/go-redis/redis/v7 v7.4.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index 4c1a58bfc86c..e57be5f379f6 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -706,8 +706,8 @@ 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/receiver/sapmreceiver/factory.go b/receiver/sapmreceiver/factory.go index dbeb9f15fc1a..df3ad8d39d38 100644 --- a/receiver/sapmreceiver/factory.go +++ b/receiver/sapmreceiver/factory.go @@ -26,7 +26,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" ) const ( @@ -39,10 +38,10 @@ const ( // NewFactory creates a factory for SAPM receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithTraces(createTracesReceiver)) + component.WithTracesReceiver(createTracesReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index 15f2737f8800..bc5d7ff0691d 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -10,7 +10,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.45.1 github.com/signalfx/sapm-proto v0.9.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a ) diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index da0378eb1431..b95f97cab730 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -822,8 +822,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.44.0/go.mod h1:4jo1R8uBDspLCxUGhQ0k3v/EFXFbW7s0AIy3LuGLbcU= go.opentelemetry.io/collector/model v0.45.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= diff --git a/receiver/signalfxreceiver/factory.go b/receiver/signalfxreceiver/factory.go index d3eab11b5156..c203b443c68a 100644 --- a/receiver/signalfxreceiver/factory.go +++ b/receiver/signalfxreceiver/factory.go @@ -25,7 +25,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" ) // This file implements factory for SignalFx receiver. @@ -40,11 +39,11 @@ const ( // NewFactory creates a factory for SignalFx receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver), - receiverhelper.WithLogs(createLogsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver), + component.WithLogsReceiver(createLogsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index 1f6a74f33fa1..274641e0312e 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -11,7 +11,7 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index 07b3700a5a3a..ed8ef0e244cb 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -273,8 +273,8 @@ go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/simpleprometheusreceiver/factory.go b/receiver/simpleprometheusreceiver/factory.go index 9c1bebf803f3..f4c2b5518d61 100644 --- a/receiver/simpleprometheusreceiver/factory.go +++ b/receiver/simpleprometheusreceiver/factory.go @@ -22,7 +22,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" ) // This file implements factory for prometheus_simple receiver @@ -38,10 +37,10 @@ var defaultCollectionInterval = 10 * time.Second // NewFactory creates a factory for "Simple" Prometheus receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index 4cf1b1460608..a41e345325c6 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/prometheus/common v0.32.1 github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 k8s.io/client-go v0.23.4 ) diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index 2ae62e815c8a..7c462596b6f4 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -1434,8 +1434,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/splunkhecreceiver/factory.go b/receiver/splunkhecreceiver/factory.go index c8181d26e47f..2887e50f5b15 100644 --- a/receiver/splunkhecreceiver/factory.go +++ b/receiver/splunkhecreceiver/factory.go @@ -22,7 +22,6 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" conventions "go.opentelemetry.io/collector/model/semconv/v1.6.1" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk" @@ -40,11 +39,11 @@ const ( // NewFactory creates a factory for Splunk HEC receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver), - receiverhelper.WithLogs(createLogsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver), + component.WithLogsReceiver(createLogsReceiver)) } // CreateDefaultConfig creates the default configuration for Splunk HEC receiver. diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index be5c17ff33e5..0d9c0ca838ed 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 ) diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index 2306313c09be..39aa3d9a6291 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -192,8 +192,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/statsdreceiver/factory.go b/receiver/statsdreceiver/factory.go index a45530f51ed0..c48115f84cc4 100644 --- a/receiver/statsdreceiver/factory.go +++ b/receiver/statsdreceiver/factory.go @@ -22,7 +22,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver/protocol" ) @@ -43,10 +42,10 @@ var ( // NewFactory creates a factory for the StatsD receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver), + component.WithMetricsReceiver(createMetricsReceiver), ) } diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index fa1839fdb10c..40bf342e19ea 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.45.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.opentelemetry.io/otel v1.4.1 go.uber.org/multierr v1.7.0 diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index 8b7953f68944..e2cf782dc313 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -184,8 +184,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index 3be29c604844..08543a2c02b2 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.45.1 github.com/open-telemetry/opentelemetry-log-collection v0.25.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a gopkg.in/yaml.v2 v2.4.0 ) diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index c2bfb2ab1aa6..962373991a81 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -213,8 +213,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index d54da9386849..3fd2d2a0c272 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.45.1 github.com/open-telemetry/opentelemetry-log-collection v0.25.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index 2dc7cedc4e36..a8c14023bb68 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -210,8 +210,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index f542ce6f6aa7..f3f7c918b5c3 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.45.1 github.com/open-telemetry/opentelemetry-log-collection v0.25.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index e87ef8700c16..f08f5573f4a6 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -208,8 +208,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/wavefrontreceiver/factory.go b/receiver/wavefrontreceiver/factory.go index ee7828416a09..3386efe9ccc0 100644 --- a/receiver/wavefrontreceiver/factory.go +++ b/receiver/wavefrontreceiver/factory.go @@ -21,7 +21,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/protocol" @@ -37,10 +36,10 @@ const ( // NewFactory creates a factory for WaveFront receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } func createDefaultConfig() config.Receiver { diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index abdbc96e61db..627f5bf7e114 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 google.golang.org/protobuf v1.27.1 ) diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index ab582d80d45f..e5b570f0d38b 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -163,8 +163,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/windowsperfcountersreceiver/factory.go b/receiver/windowsperfcountersreceiver/factory.go index 31576f06cab6..6e2fbb7078d1 100644 --- a/receiver/windowsperfcountersreceiver/factory.go +++ b/receiver/windowsperfcountersreceiver/factory.go @@ -19,7 +19,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" ) @@ -30,10 +29,10 @@ const typeStr = "windowsperfcounters" // NewFactory creates a new factory for windows perf counters receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver)) + component.WithMetricsReceiver(createMetricsReceiver)) } // createDefaultConfig creates the default configuration for receiver. diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index 18a4e0d3df65..c34f143398ff 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220219184850-89e0d42c11df go.uber.org/multierr v1.7.0 go.uber.org/zap v1.21.0 diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index aa0501158a71..a846a73b0608 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -164,8 +164,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220219184850-89e0d42c11df h1:vwweR90FyqAdSbd15Jd7ixsw7CnHEM2r7A9Is4YX7uw= go.opentelemetry.io/collector/model v0.45.1-0.20220219184850-89e0d42c11df/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/zipkinreceiver/factory.go b/receiver/zipkinreceiver/factory.go index f098fd114b05..6d39874a756c 100644 --- a/receiver/zipkinreceiver/factory.go +++ b/receiver/zipkinreceiver/factory.go @@ -21,7 +21,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" ) // This file implements factory for Zipkin receiver. @@ -34,10 +33,10 @@ const ( // NewFactory creates a new Zipkin receiver factory func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithTraces(createTracesReceiver), + component.WithTracesReceiver(createTracesReceiver), ) } diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index ce5ee0a63dbc..97e1b5d6789a 100644 --- a/receiver/zipkinreceiver/go.mod +++ b/receiver/zipkinreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.45.1 github.com/openzipkin/zipkin-go v0.4.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a google.golang.org/protobuf v1.27.1 ) diff --git a/receiver/zipkinreceiver/go.sum b/receiver/zipkinreceiver/go.sum index d0dff399b617..81a898e317d9 100644 --- a/receiver/zipkinreceiver/go.sum +++ b/receiver/zipkinreceiver/go.sum @@ -243,8 +243,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 h1:n9b7AAdbQtQ0k9dm0Dm2/KUcUqtG8i2O15KzNaDze8c= diff --git a/receiver/zookeeperreceiver/factory.go b/receiver/zookeeperreceiver/factory.go index 47cc2d9c65ce..f57980cca3e7 100644 --- a/receiver/zookeeperreceiver/factory.go +++ b/receiver/zookeeperreceiver/factory.go @@ -22,7 +22,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver/internal/metadata" @@ -36,10 +35,10 @@ const ( ) func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithMetrics(createMetricsReceiver), + component.WithMetricsReceiver(createMetricsReceiver), ) } diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index 4992682347ab..c00417eff0fd 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/containertest v0.45.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.45.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/zap v1.21.0 diff --git a/receiver/zookeeperreceiver/go.sum b/receiver/zookeeperreceiver/go.sum index 2d2b4d23cfc5..b315175d7d0f 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -696,8 +696,8 @@ 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.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= diff --git a/testbed/go.mod b/testbed/go.mod index 9ff01c34f90a..7ad6007bc924 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -26,7 +26,7 @@ require ( github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 github.com/shirou/gopsutil/v3 v3.22.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a go.uber.org/atomic v1.9.0 go.uber.org/zap v1.21.0 diff --git a/testbed/go.sum b/testbed/go.sum index e26d44a124bb..507ce520169a 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -1664,8 +1664,8 @@ 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 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.44.0/go.mod h1:4jo1R8uBDspLCxUGhQ0k3v/EFXFbW7s0AIy3LuGLbcU= go.opentelemetry.io/collector/model v0.45.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/collector/model v0.45.1-0.20220222185228-27f7607ca13a h1:jHwLRkrcUHq21Zlo5tKFzsUxY8dn2NAUwgLG1HI/Nho= diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go b/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go index c0cacb9d8f1a..e598c404e7b3 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/factory.go @@ -20,7 +20,6 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/receiverhelper" ) // This file implements factory for awsxray receiver. @@ -35,10 +34,10 @@ const ( // NewFactory creates a factory for SAPM receiver. func NewFactory() component.ReceiverFactory { - return receiverhelper.NewFactory( + return component.NewReceiverFactory( typeStr, createDefaultConfig, - receiverhelper.WithTraces(createTracesReceiver)) + component.WithTracesReceiver(createTracesReceiver)) } // CreateDefaultConfig creates the default configuration for Jaeger receiver. diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod index 0329772c3306..c58fe5b461ea 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/gorilla/mux v1.8.0 - go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d + go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 go.opentelemetry.io/collector/model v0.45.1-0.20220219184850-89e0d42c11df go.uber.org/zap v1.21.0 diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum index be50f8d2e9f9..5a978e6ee77e 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum @@ -148,8 +148,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d h1:5Fb57kkMIYWXyFqvfig5901oBSm+UemVf/lJymsvElo= -go.opentelemetry.io/collector v0.45.1-0.20220222205432-ec4f7040191d/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75 h1:zdAIwpmA58QNwgUblSc+a2T+EcBqwKvOftLapVEOlbg= +go.opentelemetry.io/collector v0.45.1-0.20220223001941-c9c253193a75/go.mod h1:4aW0pu1ZhJhy6wDXvBatnYqIUFjQ9f+NbKyHSH74U/Y= go.opentelemetry.io/collector/model v0.45.1-0.20220219184850-89e0d42c11df h1:vwweR90FyqAdSbd15Jd7ixsw7CnHEM2r7A9Is4YX7uw= go.opentelemetry.io/collector/model v0.45.1-0.20220219184850-89e0d42c11df/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk=