From c443795e1139d370d595e529824e69a14f94f69c Mon Sep 17 00:00:00 2001 From: Dmitry Anoshin Date: Tue, 7 Jan 2025 09:20:40 -0800 Subject: [PATCH] Update usage of deprecated core modules --- connector/countconnector/go.sum | 3 +-- connector/datadogconnector/go.sum | 2 -- connector/exceptionsconnector/go.sum | 3 +-- connector/routingconnector/go.sum | 3 +-- connector/signaltometricsconnector/go.sum | 3 +-- connector/spanmetricsconnector/go.sum | 3 +-- connector/sumconnector/go.sum | 3 +-- exporter/datadogexporter/go.mod | 1 - exporter/datadogexporter/go.sum | 2 -- .../datadogexporter/integrationtest/go.sum | 2 -- .../integrationtest/go.mod | 1 - .../integrationtest/go.sum | 2 -- .../encoding/textencodingextension/go.sum | 3 +-- extension/storage/dbstorage/client.go | 4 ++-- extension/storage/dbstorage/extension.go | 2 +- extension/storage/dbstorage/extension_test.go | 2 +- extension/storage/dbstorage/go.mod | 3 +-- extension/storage/dbstorage/go.sum | 2 -- extension/storage/filestorage/client.go | 4 ++-- extension/storage/filestorage/client_test.go | 20 +++++++++---------- extension/storage/filestorage/extension.go | 2 +- .../storage/filestorage/extension_test.go | 2 +- extension/storage/filestorage/go.mod | 3 +-- extension/storage/filestorage/go.sum | 2 -- extension/storage/go.mod | 3 +-- extension/storage/go.sum | 2 -- .../redisstorageextension/extension.go | 4 ++-- .../redisstorageextension/extension_test.go | 2 +- .../storage/redisstorageextension/go.mod | 3 +-- .../storage/redisstorageextension/go.sum | 2 -- extension/storage/storagetest/client.go | 4 ++-- extension/storage/storagetest/extension.go | 2 +- .../storage/storagetest/extension_test.go | 2 +- internal/sqlquery/config.go | 2 +- internal/sqlquery/go.mod | 4 ++-- internal/sqlquery/metrics.go | 2 +- internal/sqlquery/scraper.go | 2 +- pkg/stanza/adapter/receiver.go | 2 +- pkg/stanza/adapter/storage.go | 2 +- .../fileconsumer/internal/header/reader.go | 2 +- pkg/stanza/go.mod | 3 +-- pkg/stanza/go.sum | 2 -- processor/attributesprocessor/go.sum | 3 +-- processor/cumulativetodeltaprocessor/go.sum | 3 +-- processor/filterprocessor/go.sum | 3 +-- processor/logdedupprocessor/go.sum | 3 +-- processor/logstransformprocessor/go.mod | 3 +-- processor/logstransformprocessor/go.sum | 2 -- processor/logstransformprocessor/processor.go | 2 +- processor/metricstransformprocessor/go.sum | 3 +-- processor/resourceprocessor/go.sum | 3 +-- processor/spanprocessor/go.sum | 3 +-- processor/tailsamplingprocessor/go.sum | 3 +-- processor/transformprocessor/go.sum | 3 +-- receiver/activedirectorydsreceiver/config.go | 2 +- .../activedirectorydsreceiver/config_test.go | 2 +- receiver/activedirectorydsreceiver/factory.go | 2 +- .../factory_windows.go | 2 +- receiver/activedirectorydsreceiver/go.mod | 2 +- receiver/aerospikereceiver/config.go | 2 +- receiver/aerospikereceiver/config_test.go | 2 +- receiver/aerospikereceiver/factory.go | 2 +- receiver/aerospikereceiver/go.mod | 2 +- receiver/apachereceiver/config.go | 2 +- receiver/apachereceiver/factory.go | 2 +- receiver/apachereceiver/factory_test.go | 2 +- receiver/apachereceiver/go.mod | 2 +- receiver/apachesparkreceiver/config.go | 2 +- receiver/apachesparkreceiver/config_test.go | 2 +- receiver/apachesparkreceiver/factory.go | 2 +- receiver/apachesparkreceiver/factory_test.go | 2 +- receiver/apachesparkreceiver/go.mod | 2 +- receiver/apachesparkreceiver/scraper_test.go | 2 +- .../azureeventhubreceiver/eventhubhandler.go | 2 +- receiver/azureeventhubreceiver/go.mod | 3 +-- receiver/azureeventhubreceiver/go.sum | 2 -- receiver/azureeventhubreceiver/persister.go | 2 +- .../azureeventhubreceiver/persister_test.go | 4 ++-- receiver/azuremonitorreceiver/config.go | 2 +- receiver/azuremonitorreceiver/factory.go | 2 +- receiver/azuremonitorreceiver/factory_test.go | 2 +- receiver/azuremonitorreceiver/go.mod | 2 +- receiver/bigipreceiver/config.go | 2 +- receiver/bigipreceiver/config_test.go | 2 +- receiver/bigipreceiver/factory.go | 2 +- receiver/bigipreceiver/factory_test.go | 2 +- receiver/bigipreceiver/go.mod | 2 +- receiver/chronyreceiver/config.go | 2 +- receiver/chronyreceiver/config_test.go | 2 +- receiver/chronyreceiver/factory.go | 2 +- receiver/chronyreceiver/factory_test.go | 2 +- receiver/chronyreceiver/go.mod | 2 +- receiver/couchdbreceiver/config.go | 2 +- receiver/couchdbreceiver/config_test.go | 2 +- receiver/couchdbreceiver/factory.go | 2 +- receiver/couchdbreceiver/go.mod | 2 +- receiver/dockerstatsreceiver/config.go | 2 +- receiver/dockerstatsreceiver/config_test.go | 2 +- receiver/dockerstatsreceiver/factory.go | 2 +- receiver/dockerstatsreceiver/go.mod | 2 +- receiver/dockerstatsreceiver/receiver_test.go | 2 +- receiver/elasticsearchreceiver/config.go | 2 +- receiver/elasticsearchreceiver/config_test.go | 2 +- receiver/elasticsearchreceiver/factory.go | 2 +- receiver/elasticsearchreceiver/go.mod | 2 +- receiver/expvarreceiver/config.go | 2 +- receiver/expvarreceiver/config_test.go | 2 +- receiver/expvarreceiver/factory.go | 2 +- receiver/expvarreceiver/factory_test.go | 2 +- receiver/expvarreceiver/go.mod | 2 +- receiver/filelogreceiver/go.mod | 1 - receiver/filelogreceiver/go.sum | 2 -- receiver/filestatsreceiver/config.go | 2 +- receiver/filestatsreceiver/config_test.go | 2 +- receiver/filestatsreceiver/factory.go | 2 +- receiver/filestatsreceiver/go.mod | 2 +- receiver/flinkmetricsreceiver/config.go | 2 +- receiver/flinkmetricsreceiver/config_test.go | 2 +- receiver/flinkmetricsreceiver/factory.go | 2 +- receiver/flinkmetricsreceiver/factory_test.go | 2 +- receiver/flinkmetricsreceiver/go.mod | 2 +- receiver/githubreceiver/config.go | 2 +- receiver/githubreceiver/config_test.go | 2 +- receiver/githubreceiver/factory.go | 2 +- receiver/githubreceiver/go.mod | 2 +- .../googlecloudmonitoringreceiver/config.go | 2 +- .../config_test.go | 2 +- .../googlecloudmonitoringreceiver/factory.go | 2 +- receiver/googlecloudmonitoringreceiver/go.mod | 2 +- receiver/googlecloudspannerreceiver/config.go | 2 +- .../googlecloudspannerreceiver/config_test.go | 2 +- .../googlecloudspannerreceiver/factory.go | 2 +- receiver/googlecloudspannerreceiver/go.mod | 2 +- receiver/haproxyreceiver/config.go | 2 +- receiver/haproxyreceiver/factory.go | 2 +- receiver/haproxyreceiver/go.mod | 2 +- receiver/hostmetricsreceiver/config.go | 2 +- receiver/hostmetricsreceiver/config_test.go | 2 +- receiver/hostmetricsreceiver/factory.go | 2 +- receiver/hostmetricsreceiver/go.mod | 2 +- .../hostmetrics_receiver_test.go | 2 +- receiver/httpcheckreceiver/config.go | 2 +- receiver/httpcheckreceiver/config_test.go | 2 +- receiver/httpcheckreceiver/factory.go | 2 +- receiver/httpcheckreceiver/factory_test.go | 2 +- receiver/httpcheckreceiver/go.mod | 2 +- receiver/huaweicloudcesreceiver/config.go | 2 +- receiver/huaweicloudcesreceiver/go.mod | 2 +- .../huaweicloudcesreceiver/receiver_test.go | 2 +- receiver/iisreceiver/config.go | 2 +- receiver/iisreceiver/factory.go | 2 +- receiver/iisreceiver/factory_test.go | 2 +- receiver/iisreceiver/factory_windows.go | 2 +- receiver/iisreceiver/go.mod | 2 +- receiver/journaldreceiver/go.mod | 1 - receiver/journaldreceiver/go.sum | 2 -- receiver/kafkametricsreceiver/config.go | 2 +- receiver/kafkametricsreceiver/config_test.go | 2 +- receiver/kafkametricsreceiver/factory.go | 2 +- receiver/kafkametricsreceiver/go.mod | 2 +- receiver/kafkametricsreceiver/receiver.go | 2 +- receiver/kubeletstatsreceiver/config.go | 2 +- receiver/kubeletstatsreceiver/config_test.go | 2 +- receiver/kubeletstatsreceiver/factory.go | 2 +- receiver/kubeletstatsreceiver/factory_test.go | 2 +- receiver/kubeletstatsreceiver/go.mod | 2 +- receiver/memcachedreceiver/config.go | 2 +- receiver/memcachedreceiver/factory.go | 2 +- receiver/memcachedreceiver/factory_test.go | 2 +- receiver/memcachedreceiver/go.mod | 2 +- receiver/mongodbatlasreceiver/access_logs.go | 2 +- .../access_logs_integration_test.go | 2 +- .../mongodbatlasreceiver/access_logs_test.go | 4 ++-- receiver/mongodbatlasreceiver/alerts.go | 2 +- receiver/mongodbatlasreceiver/alerts_test.go | 4 ++-- receiver/mongodbatlasreceiver/config.go | 2 +- receiver/mongodbatlasreceiver/config_test.go | 2 +- receiver/mongodbatlasreceiver/events.go | 2 +- receiver/mongodbatlasreceiver/events_test.go | 2 +- receiver/mongodbatlasreceiver/factory.go | 2 +- receiver/mongodbatlasreceiver/go.mod | 5 ++--- receiver/mongodbatlasreceiver/go.sum | 2 -- receiver/mongodbreceiver/config.go | 2 +- receiver/mongodbreceiver/config_test.go | 2 +- receiver/mongodbreceiver/factory.go | 2 +- receiver/mongodbreceiver/factory_test.go | 2 +- receiver/mongodbreceiver/go.mod | 2 +- receiver/mysqlreceiver/config.go | 2 +- receiver/mysqlreceiver/factory.go | 2 +- receiver/mysqlreceiver/factory_test.go | 2 +- receiver/mysqlreceiver/go.mod | 2 +- receiver/namedpipereceiver/go.mod | 1 - receiver/namedpipereceiver/go.sum | 2 -- receiver/nginxreceiver/config.go | 2 +- receiver/nginxreceiver/factory.go | 2 +- receiver/nginxreceiver/factory_test.go | 2 +- receiver/nginxreceiver/go.mod | 2 +- receiver/nsxtreceiver/config.go | 2 +- receiver/nsxtreceiver/config_test.go | 2 +- receiver/nsxtreceiver/factory.go | 2 +- receiver/nsxtreceiver/factory_test.go | 2 +- receiver/nsxtreceiver/go.mod | 2 +- receiver/ntpreceiver/config.go | 2 +- receiver/ntpreceiver/config_test.go | 2 +- receiver/ntpreceiver/factory.go | 2 +- receiver/ntpreceiver/go.mod | 2 +- receiver/oracledbreceiver/config.go | 2 +- receiver/oracledbreceiver/config_test.go | 2 +- receiver/oracledbreceiver/factory.go | 2 +- receiver/oracledbreceiver/go.mod | 2 +- receiver/oracledbreceiver/scraper.go | 2 +- receiver/osqueryreceiver/config.go | 2 +- receiver/osqueryreceiver/go.mod | 2 +- receiver/otlpjsonfilereceiver/go.mod | 1 - receiver/otlpjsonfilereceiver/go.sum | 2 -- receiver/podmanreceiver/config.go | 2 +- receiver/podmanreceiver/config_test.go | 2 +- receiver/podmanreceiver/factory.go | 2 +- receiver/podmanreceiver/go.mod | 2 +- receiver/podmanreceiver/podman_test.go | 2 +- receiver/podmanreceiver/receiver.go | 2 +- receiver/podmanreceiver/receiver_test.go | 2 +- receiver/postgresqlreceiver/config.go | 2 +- receiver/postgresqlreceiver/factory.go | 2 +- receiver/postgresqlreceiver/factory_test.go | 2 +- receiver/postgresqlreceiver/go.mod | 2 +- receiver/rabbitmqreceiver/config.go | 2 +- receiver/rabbitmqreceiver/factory.go | 2 +- receiver/rabbitmqreceiver/factory_test.go | 2 +- receiver/rabbitmqreceiver/go.mod | 2 +- receiver/redisreceiver/config.go | 2 +- receiver/redisreceiver/config_test.go | 2 +- receiver/redisreceiver/factory.go | 2 +- receiver/redisreceiver/go.mod | 2 +- receiver/riakreceiver/config.go | 2 +- receiver/riakreceiver/config_test.go | 2 +- receiver/riakreceiver/factory.go | 2 +- receiver/riakreceiver/factory_test.go | 2 +- receiver/riakreceiver/go.mod | 2 +- receiver/saphanareceiver/config.go | 2 +- receiver/saphanareceiver/factory.go | 2 +- receiver/saphanareceiver/factory_test.go | 2 +- receiver/saphanareceiver/go.mod | 2 +- receiver/snmpreceiver/config.go | 2 +- receiver/snmpreceiver/factory.go | 2 +- receiver/snmpreceiver/factory_test.go | 2 +- receiver/snmpreceiver/go.mod | 2 +- receiver/snowflakereceiver/config.go | 2 +- receiver/snowflakereceiver/config_test.go | 2 +- receiver/snowflakereceiver/factory.go | 2 +- receiver/snowflakereceiver/go.mod | 2 +- .../splunkenterprisereceiver/client_test.go | 2 +- receiver/splunkenterprisereceiver/config.go | 2 +- receiver/splunkenterprisereceiver/factory.go | 2 +- .../splunkenterprisereceiver/factory_test.go | 2 +- receiver/splunkenterprisereceiver/go.mod | 2 +- .../splunkenterprisereceiver/scraper_test.go | 2 +- receiver/sqlqueryreceiver/config.go | 2 +- receiver/sqlqueryreceiver/config_test.go | 2 +- receiver/sqlqueryreceiver/go.mod | 5 ++--- receiver/sqlqueryreceiver/go.sum | 2 -- receiver/sqlqueryreceiver/logs_receiver.go | 2 +- receiver/sqlqueryreceiver/receiver.go | 2 +- receiver/sqlqueryreceiver/receiver_test.go | 2 +- receiver/sqlserverreceiver/config.go | 2 +- .../sqlserverreceiver/config_others_test.go | 2 +- receiver/sqlserverreceiver/config_test.go | 2 +- .../sqlserverreceiver/config_windows_test.go | 2 +- receiver/sqlserverreceiver/factory.go | 2 +- receiver/sqlserverreceiver/factory_others.go | 2 +- receiver/sqlserverreceiver/factory_test.go | 2 +- receiver/sqlserverreceiver/factory_windows.go | 2 +- receiver/sqlserverreceiver/go.mod | 2 +- receiver/sqlserverreceiver/scraper.go | 2 +- receiver/sshcheckreceiver/config.go | 2 +- receiver/sshcheckreceiver/config_test.go | 2 +- receiver/sshcheckreceiver/factory.go | 2 +- receiver/sshcheckreceiver/factory_test.go | 2 +- receiver/sshcheckreceiver/go.mod | 2 +- receiver/syslogreceiver/go.mod | 1 - receiver/syslogreceiver/go.sum | 2 -- receiver/tcplogreceiver/go.mod | 1 - receiver/tcplogreceiver/go.sum | 2 -- receiver/tlscheckreceiver/config.go | 2 +- receiver/tlscheckreceiver/config_test.go | 2 +- receiver/tlscheckreceiver/factory.go | 2 +- receiver/tlscheckreceiver/factory_test.go | 2 +- receiver/tlscheckreceiver/go.mod | 2 +- receiver/udplogreceiver/go.mod | 1 - receiver/udplogreceiver/go.sum | 2 -- receiver/vcenterreceiver/config.go | 2 +- receiver/vcenterreceiver/config_test.go | 2 +- receiver/vcenterreceiver/factory.go | 2 +- receiver/vcenterreceiver/go.mod | 2 +- receiver/windowseventlogreceiver/go.mod | 1 - receiver/windowseventlogreceiver/go.sum | 2 -- .../windowsperfcountersreceiver/config.go | 2 +- .../config_test.go | 2 +- .../windowsperfcountersreceiver/factory.go | 2 +- .../factory_windows.go | 2 +- receiver/windowsperfcountersreceiver/go.mod | 2 +- .../windowsperfcounters_scraper_test.go | 2 +- receiver/zookeeperreceiver/config.go | 2 +- receiver/zookeeperreceiver/factory.go | 2 +- receiver/zookeeperreceiver/go.mod | 2 +- testbed/go.mod | 1 - testbed/go.sum | 2 -- 307 files changed, 293 insertions(+), 373 deletions(-) diff --git a/connector/countconnector/go.sum b/connector/countconnector/go.sum index 04ea048b6e01..f2c01aad6a36 100644 --- a/connector/countconnector/go.sum +++ b/connector/countconnector/go.sum @@ -219,8 +219,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum index 3facf009b4d9..a3f925140d26 100644 --- a/connector/datadogconnector/go.sum +++ b/connector/datadogconnector/go.sum @@ -926,8 +926,6 @@ go.opentelemetry.io/collector/extension/auth v0.116.1-0.20250107062214-ced38e8af go.opentelemetry.io/collector/extension/auth v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:G4hZQ8YcFZG0CdPNKgFsbVxccg1HxpPIOj1dp3kiqK0= go.opentelemetry.io/collector/extension/auth/authtest v0.116.0 h1:KcMvjb4R0wpkmmi7EOk7zT5sgl7uwXY/VQfMEUVYcLM= go.opentelemetry.io/collector/extension/auth/authtest v0.116.0/go.mod h1:zyWTdh+CUKh7BbszTWUWp806NA6EDyix77O4Q6XaOA8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae h1:yNz7znsH5axFPdx3s5hcNOW8zeSDFuQdLFq7QsV4P9g= go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:W2NO5doyflSwrakLAXA497yn2XtvdUYGJqDppcg6oXY= go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae h1:CcLb5enUjIXSwi2CWpVULD9nA6TtmxnxVEF1cOUL2gE= diff --git a/connector/exceptionsconnector/go.sum b/connector/exceptionsconnector/go.sum index 384b40163573..b69255a9309c 100644 --- a/connector/exceptionsconnector/go.sum +++ b/connector/exceptionsconnector/go.sum @@ -133,8 +133,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= diff --git a/connector/routingconnector/go.sum b/connector/routingconnector/go.sum index f422cf5fa838..525e3e815041 100644 --- a/connector/routingconnector/go.sum +++ b/connector/routingconnector/go.sum @@ -221,8 +221,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= diff --git a/connector/signaltometricsconnector/go.sum b/connector/signaltometricsconnector/go.sum index 929bbccefba9..a8487a502956 100644 --- a/connector/signaltometricsconnector/go.sum +++ b/connector/signaltometricsconnector/go.sum @@ -217,8 +217,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= diff --git a/connector/spanmetricsconnector/go.sum b/connector/spanmetricsconnector/go.sum index d7deee400e84..77f2db8f9a1e 100644 --- a/connector/spanmetricsconnector/go.sum +++ b/connector/spanmetricsconnector/go.sum @@ -143,8 +143,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= diff --git a/connector/sumconnector/go.sum b/connector/sumconnector/go.sum index 04ea048b6e01..f2c01aad6a36 100644 --- a/connector/sumconnector/go.sum +++ b/connector/sumconnector/go.sum @@ -219,8 +219,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 5902d779dbd7..8c90ed8c5943 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -344,7 +344,6 @@ require ( go.opentelemetry.io/collector/exporter/xexporter v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/auth v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index cd10d70096b6..b6bf8a424263 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -1081,8 +1081,6 @@ go.opentelemetry.io/collector/extension/auth v0.116.1-0.20250107062214-ced38e8af go.opentelemetry.io/collector/extension/auth v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:G4hZQ8YcFZG0CdPNKgFsbVxccg1HxpPIOj1dp3kiqK0= go.opentelemetry.io/collector/extension/auth/authtest v0.116.0 h1:KcMvjb4R0wpkmmi7EOk7zT5sgl7uwXY/VQfMEUVYcLM= go.opentelemetry.io/collector/extension/auth/authtest v0.116.0/go.mod h1:zyWTdh+CUKh7BbszTWUWp806NA6EDyix77O4Q6XaOA8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae h1:yNz7znsH5axFPdx3s5hcNOW8zeSDFuQdLFq7QsV4P9g= go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:W2NO5doyflSwrakLAXA497yn2XtvdUYGJqDppcg6oXY= go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae h1:CcLb5enUjIXSwi2CWpVULD9nA6TtmxnxVEF1cOUL2gE= diff --git a/exporter/datadogexporter/integrationtest/go.sum b/exporter/datadogexporter/integrationtest/go.sum index f2360e32263d..2788b2174f68 100644 --- a/exporter/datadogexporter/integrationtest/go.sum +++ b/exporter/datadogexporter/integrationtest/go.sum @@ -1065,8 +1065,6 @@ go.opentelemetry.io/collector/extension/auth v0.116.1-0.20250107062214-ced38e8af go.opentelemetry.io/collector/extension/auth v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:G4hZQ8YcFZG0CdPNKgFsbVxccg1HxpPIOj1dp3kiqK0= go.opentelemetry.io/collector/extension/auth/authtest v0.116.0 h1:KcMvjb4R0wpkmmi7EOk7zT5sgl7uwXY/VQfMEUVYcLM= go.opentelemetry.io/collector/extension/auth/authtest v0.116.0/go.mod h1:zyWTdh+CUKh7BbszTWUWp806NA6EDyix77O4Q6XaOA8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae h1:yNz7znsH5axFPdx3s5hcNOW8zeSDFuQdLFq7QsV4P9g= go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:W2NO5doyflSwrakLAXA497yn2XtvdUYGJqDppcg6oXY= go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae h1:CcLb5enUjIXSwi2CWpVULD9nA6TtmxnxVEF1cOUL2gE= diff --git a/exporter/elasticsearchexporter/integrationtest/go.mod b/exporter/elasticsearchexporter/integrationtest/go.mod index 386db47332cb..35215e35c723 100644 --- a/exporter/elasticsearchexporter/integrationtest/go.mod +++ b/exporter/elasticsearchexporter/integrationtest/go.mod @@ -160,7 +160,6 @@ require ( go.opentelemetry.io/collector/exporter/otlphttpexporter v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/exporter/xexporter v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/auth v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect diff --git a/exporter/elasticsearchexporter/integrationtest/go.sum b/exporter/elasticsearchexporter/integrationtest/go.sum index 5250a9f8f429..c746f65b964b 100644 --- a/exporter/elasticsearchexporter/integrationtest/go.sum +++ b/exporter/elasticsearchexporter/integrationtest/go.sum @@ -354,8 +354,6 @@ go.opentelemetry.io/collector/extension/auth v0.116.1-0.20250107062214-ced38e8af go.opentelemetry.io/collector/extension/auth v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:G4hZQ8YcFZG0CdPNKgFsbVxccg1HxpPIOj1dp3kiqK0= go.opentelemetry.io/collector/extension/auth/authtest v0.116.1-0.20250107062214-ced38e8af2ae h1:WOg72DB7pf9d9EHAlN48Eaft8ZwntFXB7cyKgDlByMg= go.opentelemetry.io/collector/extension/auth/authtest v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:yGLwbwD05UcYnVclk8F1+gqVx89haNBf49lqLGQ0mwQ= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae h1:yNz7znsH5axFPdx3s5hcNOW8zeSDFuQdLFq7QsV4P9g= go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:W2NO5doyflSwrakLAXA497yn2XtvdUYGJqDppcg6oXY= go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae h1:CcLb5enUjIXSwi2CWpVULD9nA6TtmxnxVEF1cOUL2gE= diff --git a/extension/encoding/textencodingextension/go.sum b/extension/encoding/textencodingextension/go.sum index ce167ff12bdf..87e66c08bc99 100644 --- a/extension/encoding/textencodingextension/go.sum +++ b/extension/encoding/textencodingextension/go.sum @@ -115,8 +115,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= diff --git a/extension/storage/dbstorage/client.go b/extension/storage/dbstorage/client.go index edae4ca813b3..7f40e213fb94 100644 --- a/extension/storage/dbstorage/client.go +++ b/extension/storage/dbstorage/client.go @@ -13,7 +13,7 @@ import ( _ "github.com/jackc/pgx/v5/stdlib" // SQLite driver _ "github.com/mattn/go-sqlite3" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" ) const ( @@ -88,7 +88,7 @@ func (c *dbStorageClient) Delete(ctx context.Context, key string) error { } // Batch executes the specified operations in order. Get operation results are updated in place -func (c *dbStorageClient) Batch(ctx context.Context, ops ...storage.Operation) error { +func (c *dbStorageClient) Batch(ctx context.Context, ops ...*storage.Operation) error { var err error for _, op := range ops { switch op.Type { diff --git a/extension/storage/dbstorage/extension.go b/extension/storage/dbstorage/extension.go index feab6096dbca..847e417773d5 100644 --- a/extension/storage/dbstorage/extension.go +++ b/extension/storage/dbstorage/extension.go @@ -11,7 +11,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/extension" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" "go.uber.org/zap" ) diff --git a/extension/storage/dbstorage/extension_test.go b/extension/storage/dbstorage/extension_test.go index 11210b6ddeb3..91925971bd1c 100644 --- a/extension/storage/dbstorage/extension_test.go +++ b/extension/storage/dbstorage/extension_test.go @@ -19,8 +19,8 @@ import ( "github.com/testcontainers/testcontainers-go/wait" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/extension/experimental/storage" "go.opentelemetry.io/collector/extension/extensiontest" + "go.opentelemetry.io/collector/extension/xextension/storage" ) func TestExtensionIntegrityWithSqlite(t *testing.T) { diff --git a/extension/storage/dbstorage/go.mod b/extension/storage/dbstorage/go.mod index b89e342bf6f9..4a2bc6f3e6f4 100644 --- a/extension/storage/dbstorage/go.mod +++ b/extension/storage/dbstorage/go.mod @@ -13,8 +13,8 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/confmap v1.22.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/extension/xextension v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -68,7 +68,6 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect go.opentelemetry.io/collector/pdata v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect diff --git a/extension/storage/dbstorage/go.sum b/extension/storage/dbstorage/go.sum index 0f729f9ee0a5..3c64b1d4a921 100644 --- a/extension/storage/dbstorage/go.sum +++ b/extension/storage/dbstorage/go.sum @@ -146,8 +146,6 @@ go.opentelemetry.io/collector/confmap v1.22.1-0.20250107062214-ced38e8af2ae h1:m go.opentelemetry.io/collector/confmap v1.22.1-0.20250107062214-ced38e8af2ae/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae h1:E6kmL+xRU8sV3Rouqxei+384CV+TlT6xHRKL+34orgo= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:wracOKvOenWibBm9XsObVGfZ0xp8ztogs731mE5iTrQ= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae h1:CcLb5enUjIXSwi2CWpVULD9nA6TtmxnxVEF1cOUL2gE= go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:sXx7uDFU+bf5qKLA1B51KBk4cImehAS0sSNJK01xiqA= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae h1:fGOr5NjORpu/jxjb0jkm/AdVhW1kbHtnqPa5Okl6RYk= diff --git a/extension/storage/filestorage/client.go b/extension/storage/filestorage/client.go index bff4b03d283d..ca004bf29db4 100644 --- a/extension/storage/filestorage/client.go +++ b/extension/storage/filestorage/client.go @@ -13,7 +13,7 @@ import ( "time" "go.etcd.io/bbolt" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" "go.uber.org/zap" ) @@ -94,7 +94,7 @@ func (c *fileStorageClient) Delete(ctx context.Context, key string) error { } // Batch executes the specified operations in order. Get operation results are updated in place -func (c *fileStorageClient) Batch(_ context.Context, ops ...storage.Operation) error { +func (c *fileStorageClient) Batch(_ context.Context, ops ...*storage.Operation) error { batch := func(tx *bbolt.Tx) error { bucket := tx.Bucket(defaultBucket) if bucket == nil { diff --git a/extension/storage/filestorage/client_test.go b/extension/storage/filestorage/client_test.go index dc0657039d7a..d1d1b6213811 100644 --- a/extension/storage/filestorage/client_test.go +++ b/extension/storage/filestorage/client_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "go.etcd.io/bbolt" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) @@ -66,12 +66,12 @@ func TestClientBatchOperations(t *testing.T) { }) ctx := context.Background() - testSetEntries := []storage.Operation{ + testSetEntries := []*storage.Operation{ storage.SetOperation("testKey1", []byte("testValue1")), storage.SetOperation("testKey2", []byte("testValue2")), } - testGetEntries := []storage.Operation{ + testGetEntries := []*storage.Operation{ storage.GetOperation("testKey1"), storage.GetOperation("testKey2"), } @@ -93,7 +93,7 @@ func TestClientBatchOperations(t *testing.T) { } // Update it (the first entry should be empty and the second one removed) - testEntriesUpdate := []storage.Operation{ + testEntriesUpdate := []*storage.Operation{ storage.SetOperation("testKey1", []byte{}), storage.DeleteOperation("testKey2"), } @@ -109,7 +109,7 @@ func TestClientBatchOperations(t *testing.T) { } // Delete it all - testEntriesDelete := []storage.Operation{ + testEntriesDelete := []*storage.Operation{ storage.DeleteOperation("testKey1"), storage.DeleteOperation("testKey2"), } @@ -269,7 +269,7 @@ func TestClientReboundCompaction(t *testing.T) { numEntries := int64(0) for ; ; numEntries++ { - batchWrite := []storage.Operation{ + batchWrite := []*storage.Operation{ storage.SetOperation(fmt.Sprintf("foo-%d", numEntries), make([]byte, entrySize)), storage.SetOperation(fmt.Sprintf("bar-%d", numEntries), []byte("testValueBar")), } @@ -357,7 +357,7 @@ func TestClientConcurrentCompaction(t *testing.T) { ctx := context.Background() // Make sure the compaction conditions will be met by putting and deleting large chunk of data - batchWrite := []storage.Operation{ + batchWrite := []*storage.Operation{ storage.SetOperation("large-payload", make([]byte, 10000000)), } err = client.Batch(ctx, batchWrite...) @@ -369,7 +369,7 @@ func TestClientConcurrentCompaction(t *testing.T) { clientOperationsThread := func(t *testing.T, id int) { repeats := 10 for i := 0; i < repeats; i++ { - batchWrite := []storage.Operation{ + batchWrite := []*storage.Operation{ storage.SetOperation(fmt.Sprintf("foo-%d-%d", id, i), make([]byte, 1000)), storage.SetOperation(fmt.Sprintf("bar-%d-%d", id, i), []byte("testValueBar")), } @@ -432,7 +432,7 @@ func BenchmarkClientGet100(b *testing.B) { ctx := context.Background() - testEntries := make([]storage.Operation, 100) + testEntries := make([]*storage.Operation, 100) for i := 0; i < 100; i++ { testEntries[i] = storage.GetOperation(fmt.Sprintf("testKey-%d", i)) } @@ -474,7 +474,7 @@ func BenchmarkClientSet100(b *testing.B) { }) ctx := context.Background() - testEntries := make([]storage.Operation, 100) + testEntries := make([]*storage.Operation, 100) for i := 0; i < 100; i++ { testEntries[i] = storage.SetOperation(fmt.Sprintf("testKey-%d", i), []byte("testValue")) } diff --git a/extension/storage/filestorage/extension.go b/extension/storage/filestorage/extension.go index f26474e936c9..ff8ec568de83 100644 --- a/extension/storage/filestorage/extension.go +++ b/extension/storage/filestorage/extension.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/extension" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" "go.uber.org/zap" ) diff --git a/extension/storage/filestorage/extension_test.go b/extension/storage/filestorage/extension_test.go index 10f9b9a473a2..90b0336fb232 100644 --- a/extension/storage/filestorage/extension_test.go +++ b/extension/storage/filestorage/extension_test.go @@ -18,8 +18,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/extension" - "go.opentelemetry.io/collector/extension/experimental/storage" "go.opentelemetry.io/collector/extension/extensiontest" + "go.opentelemetry.io/collector/extension/xextension/storage" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" ) diff --git a/extension/storage/filestorage/go.mod b/extension/storage/filestorage/go.mod index b0c1f5d185b8..19b7abad1caf 100644 --- a/extension/storage/filestorage/go.mod +++ b/extension/storage/filestorage/go.mod @@ -10,8 +10,8 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/confmap v1.22.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/extension/xextension v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -30,7 +30,6 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect go.opentelemetry.io/collector/pdata v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect diff --git a/extension/storage/filestorage/go.sum b/extension/storage/filestorage/go.sum index 0317a47eec6a..42249c4f5514 100644 --- a/extension/storage/filestorage/go.sum +++ b/extension/storage/filestorage/go.sum @@ -51,8 +51,6 @@ go.opentelemetry.io/collector/confmap v1.22.1-0.20250107062214-ced38e8af2ae h1:m go.opentelemetry.io/collector/confmap v1.22.1-0.20250107062214-ced38e8af2ae/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae h1:E6kmL+xRU8sV3Rouqxei+384CV+TlT6xHRKL+34orgo= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:wracOKvOenWibBm9XsObVGfZ0xp8ztogs731mE5iTrQ= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae h1:CcLb5enUjIXSwi2CWpVULD9nA6TtmxnxVEF1cOUL2gE= go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:sXx7uDFU+bf5qKLA1B51KBk4cImehAS0sSNJK01xiqA= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae h1:fGOr5NjORpu/jxjb0jkm/AdVhW1kbHtnqPa5Okl6RYk= diff --git a/extension/storage/go.mod b/extension/storage/go.mod index 5dfef31699b7..5c523a9c45f0 100644 --- a/extension/storage/go.mod +++ b/extension/storage/go.mod @@ -7,7 +7,7 @@ require ( go.opentelemetry.io/collector/component v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/component/componenttest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/extension/xextension v0.116.0 ) require ( @@ -18,7 +18,6 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect go.opentelemetry.io/collector/pdata v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect diff --git a/extension/storage/go.sum b/extension/storage/go.sum index bc294feee04f..a6e7ef63ab61 100644 --- a/extension/storage/go.sum +++ b/extension/storage/go.sum @@ -35,8 +35,6 @@ go.opentelemetry.io/collector/config/configtelemetry v0.116.1-0.20250107062214-c go.opentelemetry.io/collector/config/configtelemetry v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:SlBEwQg0qly75rXZ6W1Ig8jN25KBVBkFIIAUI1GiAAE= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae h1:E6kmL+xRU8sV3Rouqxei+384CV+TlT6xHRKL+34orgo= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:wracOKvOenWibBm9XsObVGfZ0xp8ztogs731mE5iTrQ= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae h1:fGOr5NjORpu/jxjb0jkm/AdVhW1kbHtnqPa5Okl6RYk= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae/go.mod h1:yK3OycYduuhbbHaZ4cpolf6RZmkDv1kQHN+R7XEBKAI= go.opentelemetry.io/collector/pdata v1.22.1-0.20250107062214-ced38e8af2ae h1:wFkUtpVrgPFsooUI/YM3QhoDKlcTFQsgJ1FYA/wa8Y0= diff --git a/extension/storage/redisstorageextension/extension.go b/extension/storage/redisstorageextension/extension.go index 660ea3c418e4..a94f65c2f1bb 100644 --- a/extension/storage/redisstorageextension/extension.go +++ b/extension/storage/redisstorageextension/extension.go @@ -12,7 +12,7 @@ import ( "github.com/redis/go-redis/v9" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/extension" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" "go.uber.org/zap" ) @@ -77,7 +77,7 @@ func (rc redisClient) Delete(ctx context.Context, key string) error { return err } -func (rc redisClient) Batch(ctx context.Context, ops ...storage.Operation) error { +func (rc redisClient) Batch(ctx context.Context, ops ...*storage.Operation) error { p := rc.client.Pipeline() for _, op := range ops { switch op.Type { diff --git a/extension/storage/redisstorageextension/extension_test.go b/extension/storage/redisstorageextension/extension_test.go index 4f24e0ec91cd..6d4f7da96a7e 100644 --- a/extension/storage/redisstorageextension/extension_test.go +++ b/extension/storage/redisstorageextension/extension_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/extension/experimental/storage" "go.opentelemetry.io/collector/extension/extensiontest" + "go.opentelemetry.io/collector/extension/xextension/storage" ) func TestExtensionIntegrity(t *testing.T) { diff --git a/extension/storage/redisstorageextension/go.mod b/extension/storage/redisstorageextension/go.mod index 5efcd0950328..4334999b22ff 100644 --- a/extension/storage/redisstorageextension/go.mod +++ b/extension/storage/redisstorageextension/go.mod @@ -10,8 +10,8 @@ require ( go.opentelemetry.io/collector/config/configopaque v1.22.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/confmap v1.22.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/extension/xextension v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -32,7 +32,6 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect go.opentelemetry.io/collector/pdata v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect diff --git a/extension/storage/redisstorageextension/go.sum b/extension/storage/redisstorageextension/go.sum index 4d0772354c5c..4dbb5ff4bfb9 100644 --- a/extension/storage/redisstorageextension/go.sum +++ b/extension/storage/redisstorageextension/go.sum @@ -61,8 +61,6 @@ go.opentelemetry.io/collector/confmap v1.22.1-0.20250107062214-ced38e8af2ae h1:m go.opentelemetry.io/collector/confmap v1.22.1-0.20250107062214-ced38e8af2ae/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae h1:E6kmL+xRU8sV3Rouqxei+384CV+TlT6xHRKL+34orgo= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:wracOKvOenWibBm9XsObVGfZ0xp8ztogs731mE5iTrQ= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae h1:CcLb5enUjIXSwi2CWpVULD9nA6TtmxnxVEF1cOUL2gE= go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:sXx7uDFU+bf5qKLA1B51KBk4cImehAS0sSNJK01xiqA= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae h1:fGOr5NjORpu/jxjb0jkm/AdVhW1kbHtnqPa5Okl6RYk= diff --git a/extension/storage/storagetest/client.go b/extension/storage/storagetest/client.go index 97b99de4cfe4..6fc822642f8e 100644 --- a/extension/storage/storagetest/client.go +++ b/extension/storage/storagetest/client.go @@ -13,7 +13,7 @@ import ( "sync" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" ) var errClientClosed = errors.New("client closed") @@ -99,7 +99,7 @@ func (p *TestClient) Delete(_ context.Context, key string) error { return nil } -func (p *TestClient) Batch(_ context.Context, ops ...storage.Operation) error { +func (p *TestClient) Batch(_ context.Context, ops ...*storage.Operation) error { p.cacheMux.Lock() defer p.cacheMux.Unlock() if p.closed { diff --git a/extension/storage/storagetest/extension.go b/extension/storage/storagetest/extension.go index 259b0a303891..9b4dc89ab24e 100644 --- a/extension/storage/storagetest/extension.go +++ b/extension/storage/storagetest/extension.go @@ -8,7 +8,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/extension" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" ) var testStorageType component.Type = component.MustNewType("test_storage") diff --git a/extension/storage/storagetest/extension_test.go b/extension/storage/storagetest/extension_test.go index 43a519f79f6a..0baf20a1997f 100644 --- a/extension/storage/storagetest/extension_test.go +++ b/extension/storage/storagetest/extension_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" ) func TestID(t *testing.T) { diff --git a/internal/sqlquery/config.go b/internal/sqlquery/config.go index 7412a8069bc0..c96703be9ebc 100644 --- a/internal/sqlquery/config.go +++ b/internal/sqlquery/config.go @@ -8,7 +8,7 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" ) type Config struct { diff --git a/internal/sqlquery/go.mod b/internal/sqlquery/go.mod index bb4590b7b3a9..7b686defbbc6 100644 --- a/internal/sqlquery/go.mod +++ b/internal/sqlquery/go.mod @@ -13,8 +13,8 @@ require ( go.opentelemetry.io/collector/component v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/component/componenttest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/pdata v1.22.1-0.20250107062214-ced38e8af2ae - go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 ) @@ -79,7 +79,7 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/consumer v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect + go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect go.opentelemetry.io/otel/sdk v1.32.0 // indirect diff --git a/internal/sqlquery/metrics.go b/internal/sqlquery/metrics.go index 4ffcde6d3f62..43fead23e93b 100644 --- a/internal/sqlquery/metrics.go +++ b/internal/sqlquery/metrics.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" ) func rowToMetric(row StringMap, cfg MetricCfg, dest pmetric.Metric, startTime pcommon.Timestamp, ts pcommon.Timestamp, scrapeCfg scraperhelper.ControllerConfig) error { diff --git a/internal/sqlquery/scraper.go b/internal/sqlquery/scraper.go index dabe32993d8a..680a6164fa0a 100644 --- a/internal/sqlquery/scraper.go +++ b/internal/sqlquery/scraper.go @@ -13,9 +13,9 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" "go.opentelemetry.io/collector/scraper/scrapererror" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/zap" ) diff --git a/pkg/stanza/adapter/receiver.go b/pkg/stanza/adapter/receiver.go index 5b7760992181..774d17ea0e1c 100644 --- a/pkg/stanza/adapter/receiver.go +++ b/pkg/stanza/adapter/receiver.go @@ -9,7 +9,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" rcvr "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/receiverhelper" "go.uber.org/multierr" diff --git a/pkg/stanza/adapter/storage.go b/pkg/stanza/adapter/storage.go index 86d0b7d596e4..529981822ca1 100644 --- a/pkg/stanza/adapter/storage.go +++ b/pkg/stanza/adapter/storage.go @@ -8,7 +8,7 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" ) func GetStorageClient(ctx context.Context, host component.Host, storageID *component.ID, componentID component.ID) (storage.Client, error) { diff --git a/pkg/stanza/fileconsumer/internal/header/reader.go b/pkg/stanza/fileconsumer/internal/header/reader.go index 5103313e9621..b4b8ea5bd1d3 100644 --- a/pkg/stanza/fileconsumer/internal/header/reader.go +++ b/pkg/stanza/fileconsumer/internal/header/reader.go @@ -9,7 +9,7 @@ import ( "fmt" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/entry" diff --git a/pkg/stanza/go.mod b/pkg/stanza/go.mod index bf9a3f87b593..d3481b366170 100644 --- a/pkg/stanza/go.mod +++ b/pkg/stanza/go.mod @@ -25,7 +25,7 @@ require ( go.opentelemetry.io/collector/confmap v1.22.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/consumer v1.22.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/consumer/consumertest v0.116.1-0.20250107062214-ced38e8af2ae - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/extension/xextension v0.116.0 go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/pdata v1.22.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae @@ -68,7 +68,6 @@ require ( go.opentelemetry.io/collector/consumer/consumererror v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect diff --git a/pkg/stanza/go.sum b/pkg/stanza/go.sum index aee22a30cf7d..711e2c6e02c0 100644 --- a/pkg/stanza/go.sum +++ b/pkg/stanza/go.sum @@ -103,8 +103,6 @@ go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38 go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:dQnuZArB6AiD5p1zevGYrvn0KQFQ8WX/i5cffUdCrqA= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae h1:E6kmL+xRU8sV3Rouqxei+384CV+TlT6xHRKL+34orgo= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:wracOKvOenWibBm9XsObVGfZ0xp8ztogs731mE5iTrQ= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae h1:fGOr5NjORpu/jxjb0jkm/AdVhW1kbHtnqPa5Okl6RYk= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae/go.mod h1:yK3OycYduuhbbHaZ4cpolf6RZmkDv1kQHN+R7XEBKAI= go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae h1:vFpfVkM2ZqnFPMkZqwra9bMYbMCdHqrvrYV2s4c6bZ8= diff --git a/processor/attributesprocessor/go.sum b/processor/attributesprocessor/go.sum index 199db84ed093..1b7baea7a55c 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/go.sum @@ -225,8 +225,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= diff --git a/processor/cumulativetodeltaprocessor/go.sum b/processor/cumulativetodeltaprocessor/go.sum index ed8bdc283ec4..eb84d77a8c0a 100644 --- a/processor/cumulativetodeltaprocessor/go.sum +++ b/processor/cumulativetodeltaprocessor/go.sum @@ -131,8 +131,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= diff --git a/processor/filterprocessor/go.sum b/processor/filterprocessor/go.sum index 074ecd8060bb..41dde4792e63 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/go.sum @@ -223,8 +223,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= diff --git a/processor/logdedupprocessor/go.sum b/processor/logdedupprocessor/go.sum index 5088b44db181..8770941204de 100644 --- a/processor/logdedupprocessor/go.sum +++ b/processor/logdedupprocessor/go.sum @@ -217,8 +217,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= diff --git a/processor/logstransformprocessor/go.mod b/processor/logstransformprocessor/go.mod index ace787e2b9e3..2844938c86c6 100644 --- a/processor/logstransformprocessor/go.mod +++ b/processor/logstransformprocessor/go.mod @@ -23,7 +23,7 @@ require ( require ( go.opentelemetry.io/collector/component/componenttest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/consumer/consumertest v0.116.1-0.20250107062214-ced38e8af2ae - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/extension/xextension v0.116.0 go.opentelemetry.io/collector/processor/processortest v0.116.1-0.20250107062214-ced38e8af2ae ) @@ -58,7 +58,6 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/consumer/consumererror v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pdata/testdata v0.116.1-0.20250107062214-ced38e8af2ae // indirect diff --git a/processor/logstransformprocessor/go.sum b/processor/logstransformprocessor/go.sum index 2531b599d3e6..6e1c0033e47d 100644 --- a/processor/logstransformprocessor/go.sum +++ b/processor/logstransformprocessor/go.sum @@ -93,8 +93,6 @@ go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38 go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:dQnuZArB6AiD5p1zevGYrvn0KQFQ8WX/i5cffUdCrqA= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae h1:E6kmL+xRU8sV3Rouqxei+384CV+TlT6xHRKL+34orgo= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:wracOKvOenWibBm9XsObVGfZ0xp8ztogs731mE5iTrQ= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae h1:fGOr5NjORpu/jxjb0jkm/AdVhW1kbHtnqPa5Okl6RYk= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae/go.mod h1:yK3OycYduuhbbHaZ4cpolf6RZmkDv1kQHN+R7XEBKAI= go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae h1:vFpfVkM2ZqnFPMkZqwra9bMYbMCdHqrvrYV2s4c6bZ8= diff --git a/processor/logstransformprocessor/processor.go b/processor/logstransformprocessor/processor.go index 72d36fec1307..66e783ca4e23 100644 --- a/processor/logstransformprocessor/processor.go +++ b/processor/logstransformprocessor/processor.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" "go.opentelemetry.io/collector/pdata/plog" "go.uber.org/zap" diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index d4fbb7106c59..ce5039b27311 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -129,8 +129,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= diff --git a/processor/resourceprocessor/go.sum b/processor/resourceprocessor/go.sum index 71c441f513d6..bd7e2333b2c2 100644 --- a/processor/resourceprocessor/go.sum +++ b/processor/resourceprocessor/go.sum @@ -131,8 +131,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= diff --git a/processor/spanprocessor/go.sum b/processor/spanprocessor/go.sum index 7253b0c4a2d3..f64b0dc89fcb 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -221,8 +221,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index 03e6cac64c42..71cf9e2c3a92 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -219,8 +219,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= diff --git a/processor/transformprocessor/go.sum b/processor/transformprocessor/go.sum index 7253b0c4a2d3..f64b0dc89fcb 100644 --- a/processor/transformprocessor/go.sum +++ b/processor/transformprocessor/go.sum @@ -221,8 +221,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= diff --git a/receiver/activedirectorydsreceiver/config.go b/receiver/activedirectorydsreceiver/config.go index 929d2168ff88..995d178129fa 100644 --- a/receiver/activedirectorydsreceiver/config.go +++ b/receiver/activedirectorydsreceiver/config.go @@ -4,7 +4,7 @@ package activedirectorydsreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver" import ( - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver/internal/metadata" ) diff --git a/receiver/activedirectorydsreceiver/config_test.go b/receiver/activedirectorydsreceiver/config_test.go index 593c3002dc7a..8915cbd19764 100644 --- a/receiver/activedirectorydsreceiver/config_test.go +++ b/receiver/activedirectorydsreceiver/config_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver/internal/metadata" ) diff --git a/receiver/activedirectorydsreceiver/factory.go b/receiver/activedirectorydsreceiver/factory.go index 7bcaa740b11e..a648641582e0 100644 --- a/receiver/activedirectorydsreceiver/factory.go +++ b/receiver/activedirectorydsreceiver/factory.go @@ -8,7 +8,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver/internal/metadata" ) diff --git a/receiver/activedirectorydsreceiver/factory_windows.go b/receiver/activedirectorydsreceiver/factory_windows.go index 2603c6c89640..7cab8be5db9a 100644 --- a/receiver/activedirectorydsreceiver/factory_windows.go +++ b/receiver/activedirectorydsreceiver/factory_windows.go @@ -12,8 +12,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver/internal/metadata" ) diff --git a/receiver/activedirectorydsreceiver/go.mod b/receiver/activedirectorydsreceiver/go.mod index 541e2197b55b..7daf07ef2d0b 100644 --- a/receiver/activedirectorydsreceiver/go.mod +++ b/receiver/activedirectorydsreceiver/go.mod @@ -17,6 +17,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -47,7 +48,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect go.opentelemetry.io/otel/sdk v1.32.0 // indirect diff --git a/receiver/aerospikereceiver/config.go b/receiver/aerospikereceiver/config.go index a3ea6c5756f9..8b0bce9e87de 100644 --- a/receiver/aerospikereceiver/config.go +++ b/receiver/aerospikereceiver/config.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configtls" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/internal/metadata" diff --git a/receiver/aerospikereceiver/config_test.go b/receiver/aerospikereceiver/config_test.go index 6cfc64a83f3b..017f5252a163 100644 --- a/receiver/aerospikereceiver/config_test.go +++ b/receiver/aerospikereceiver/config_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/internal/metadata" ) diff --git a/receiver/aerospikereceiver/factory.go b/receiver/aerospikereceiver/factory.go index 174ea8b55732..4f6fb8062a44 100644 --- a/receiver/aerospikereceiver/factory.go +++ b/receiver/aerospikereceiver/factory.go @@ -10,8 +10,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/internal/metadata" ) diff --git a/receiver/aerospikereceiver/go.mod b/receiver/aerospikereceiver/go.mod index eeeba3c2b321..6ecc0eec6dc5 100644 --- a/receiver/aerospikereceiver/go.mod +++ b/receiver/aerospikereceiver/go.mod @@ -22,6 +22,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -88,7 +89,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect diff --git a/receiver/apachereceiver/config.go b/receiver/apachereceiver/config.go index 98c507513fd2..119df9576564 100644 --- a/receiver/apachereceiver/config.go +++ b/receiver/apachereceiver/config.go @@ -8,7 +8,7 @@ import ( "net/url" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver/internal/metadata" ) diff --git a/receiver/apachereceiver/factory.go b/receiver/apachereceiver/factory.go index 776372a289d3..17e06b0ffa0a 100644 --- a/receiver/apachereceiver/factory.go +++ b/receiver/apachereceiver/factory.go @@ -12,8 +12,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver/internal/metadata" ) diff --git a/receiver/apachereceiver/factory_test.go b/receiver/apachereceiver/factory_test.go index 965d85c7d57f..f95251910831 100644 --- a/receiver/apachereceiver/factory_test.go +++ b/receiver/apachereceiver/factory_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver/internal/metadata" ) diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index bef8a8ece423..a0fc12dbb096 100644 --- a/receiver/apachereceiver/go.mod +++ b/receiver/apachereceiver/go.mod @@ -21,6 +21,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -92,7 +93,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect diff --git a/receiver/apachesparkreceiver/config.go b/receiver/apachesparkreceiver/config.go index 78e5933e70b2..1ca1abc224e3 100644 --- a/receiver/apachesparkreceiver/config.go +++ b/receiver/apachesparkreceiver/config.go @@ -9,7 +9,7 @@ import ( "time" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachesparkreceiver/internal/metadata" ) diff --git a/receiver/apachesparkreceiver/config_test.go b/receiver/apachesparkreceiver/config_test.go index 189be4826945..9d6d8cebc89e 100644 --- a/receiver/apachesparkreceiver/config_test.go +++ b/receiver/apachesparkreceiver/config_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" ) func TestValidate(t *testing.T) { diff --git a/receiver/apachesparkreceiver/factory.go b/receiver/apachesparkreceiver/factory.go index 3094d37b0092..7c30f3882620 100644 --- a/receiver/apachesparkreceiver/factory.go +++ b/receiver/apachesparkreceiver/factory.go @@ -11,8 +11,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachesparkreceiver/internal/metadata" ) diff --git a/receiver/apachesparkreceiver/factory_test.go b/receiver/apachesparkreceiver/factory_test.go index ed628decbdd7..ace68667ce50 100644 --- a/receiver/apachesparkreceiver/factory_test.go +++ b/receiver/apachesparkreceiver/factory_test.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachesparkreceiver/internal/metadata" ) diff --git a/receiver/apachesparkreceiver/go.mod b/receiver/apachesparkreceiver/go.mod index 5e47516d151b..8cbfbd809fc7 100644 --- a/receiver/apachesparkreceiver/go.mod +++ b/receiver/apachesparkreceiver/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -93,7 +94,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect diff --git a/receiver/apachesparkreceiver/scraper_test.go b/receiver/apachesparkreceiver/scraper_test.go index 54fb31223e20..102a44bea681 100644 --- a/receiver/apachesparkreceiver/scraper_test.go +++ b/receiver/apachesparkreceiver/scraper_test.go @@ -15,8 +15,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper/scrapererror" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" diff --git a/receiver/azureeventhubreceiver/eventhubhandler.go b/receiver/azureeventhubreceiver/eventhubhandler.go index 94ad5915f233..01cec57282e8 100644 --- a/receiver/azureeventhubreceiver/eventhubhandler.go +++ b/receiver/azureeventhubreceiver/eventhubhandler.go @@ -9,7 +9,7 @@ import ( eventhub "github.com/Azure/azure-event-hubs-go/v3" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" diff --git a/receiver/azureeventhubreceiver/go.mod b/receiver/azureeventhubreceiver/go.mod index e81935b521d3..b8c85c30abff 100644 --- a/receiver/azureeventhubreceiver/go.mod +++ b/receiver/azureeventhubreceiver/go.mod @@ -17,7 +17,7 @@ require ( go.opentelemetry.io/collector/confmap v1.22.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/consumer v1.22.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/consumer/consumertest v0.116.1-0.20250107062214-ced38e8af2ae - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/extension/xextension v0.116.0 go.opentelemetry.io/collector/otelcol/otelcoltest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/pdata v1.22.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae @@ -105,7 +105,6 @@ require ( go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/internal/fanoutconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/otelcol v0.116.1-0.20250107062214-ced38e8af2ae // indirect diff --git a/receiver/azureeventhubreceiver/go.sum b/receiver/azureeventhubreceiver/go.sum index f85b3431a868..c3c87c6bf37c 100644 --- a/receiver/azureeventhubreceiver/go.sum +++ b/receiver/azureeventhubreceiver/go.sum @@ -240,8 +240,6 @@ go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae h go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:wracOKvOenWibBm9XsObVGfZ0xp8ztogs731mE5iTrQ= go.opentelemetry.io/collector/extension/auth v0.116.0 h1:oolKkFBIS4vhJ4ZWTD4Bp+35ATBf7dBsln63RKWAJm0= go.opentelemetry.io/collector/extension/auth v0.116.0/go.mod h1:3WeZgIiiP7wcB+tID4G3ml6J/R2oJ359PxQh/pUFnSk= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae h1:yNz7znsH5axFPdx3s5hcNOW8zeSDFuQdLFq7QsV4P9g= go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:W2NO5doyflSwrakLAXA497yn2XtvdUYGJqDppcg6oXY= go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae h1:CcLb5enUjIXSwi2CWpVULD9nA6TtmxnxVEF1cOUL2gE= diff --git a/receiver/azureeventhubreceiver/persister.go b/receiver/azureeventhubreceiver/persister.go index 7d9be7390104..a7c9cfd208d6 100644 --- a/receiver/azureeventhubreceiver/persister.go +++ b/receiver/azureeventhubreceiver/persister.go @@ -9,7 +9,7 @@ import ( "github.com/Azure/azure-event-hubs-go/v3/persist" jsoniter "github.com/json-iterator/go" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" ) const ( diff --git a/receiver/azureeventhubreceiver/persister_test.go b/receiver/azureeventhubreceiver/persister_test.go index 123cae0fbc93..656602caed70 100644 --- a/receiver/azureeventhubreceiver/persister_test.go +++ b/receiver/azureeventhubreceiver/persister_test.go @@ -12,7 +12,7 @@ import ( "github.com/Azure/azure-event-hubs-go/v3/persist" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" ) func TestStorageOffsetPersisterUnknownCheckpoint(t *testing.T) { @@ -74,7 +74,7 @@ func (p *mockClient) Delete(_ context.Context, key string) error { return nil } -func (p *mockClient) Batch(_ context.Context, ops ...storage.Operation) error { +func (p *mockClient) Batch(_ context.Context, ops ...*storage.Operation) error { p.cacheMux.Lock() defer p.cacheMux.Unlock() diff --git a/receiver/azuremonitorreceiver/config.go b/receiver/azuremonitorreceiver/config.go index 6e835003e781..a7d5da3479e1 100644 --- a/receiver/azuremonitorreceiver/config.go +++ b/receiver/azuremonitorreceiver/config.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuremonitorreceiver/internal/metadata" diff --git a/receiver/azuremonitorreceiver/factory.go b/receiver/azuremonitorreceiver/factory.go index d5054b43d5c6..ae25bfb70217 100644 --- a/receiver/azuremonitorreceiver/factory.go +++ b/receiver/azuremonitorreceiver/factory.go @@ -11,8 +11,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuremonitorreceiver/internal/metadata" ) diff --git a/receiver/azuremonitorreceiver/factory_test.go b/receiver/azuremonitorreceiver/factory_test.go index 1ddd3408c96b..7b272a0724e1 100644 --- a/receiver/azuremonitorreceiver/factory_test.go +++ b/receiver/azuremonitorreceiver/factory_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuremonitorreceiver/internal/metadata" ) diff --git a/receiver/azuremonitorreceiver/go.mod b/receiver/azuremonitorreceiver/go.mod index b8c0c9afdcc2..fd2be6997065 100644 --- a/receiver/azuremonitorreceiver/go.mod +++ b/receiver/azuremonitorreceiver/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -54,7 +55,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect go.opentelemetry.io/otel/sdk v1.32.0 // indirect diff --git a/receiver/bigipreceiver/config.go b/receiver/bigipreceiver/config.go index 8b3617c9d5c2..5f0c106cc6f3 100644 --- a/receiver/bigipreceiver/config.go +++ b/receiver/bigipreceiver/config.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configopaque" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver/internal/metadata" diff --git a/receiver/bigipreceiver/config_test.go b/receiver/bigipreceiver/config_test.go index 79c547aca55e..2459ea63da13 100644 --- a/receiver/bigipreceiver/config_test.go +++ b/receiver/bigipreceiver/config_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver/internal/metadata" diff --git a/receiver/bigipreceiver/factory.go b/receiver/bigipreceiver/factory.go index 412877668d9c..5131363208b8 100644 --- a/receiver/bigipreceiver/factory.go +++ b/receiver/bigipreceiver/factory.go @@ -12,8 +12,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver/internal/metadata" ) diff --git a/receiver/bigipreceiver/factory_test.go b/receiver/bigipreceiver/factory_test.go index c29b5dc7bb8d..78405e372ed1 100644 --- a/receiver/bigipreceiver/factory_test.go +++ b/receiver/bigipreceiver/factory_test.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver/internal/metadata" ) diff --git a/receiver/bigipreceiver/go.mod b/receiver/bigipreceiver/go.mod index 1dd229722cd2..fe1513d41816 100644 --- a/receiver/bigipreceiver/go.mod +++ b/receiver/bigipreceiver/go.mod @@ -21,6 +21,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -94,7 +95,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect diff --git a/receiver/chronyreceiver/config.go b/receiver/chronyreceiver/config.go index 0782c55526c3..f8a8e66740a3 100644 --- a/receiver/chronyreceiver/config.go +++ b/receiver/chronyreceiver/config.go @@ -9,7 +9,7 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver/internal/chrony" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver/internal/metadata" diff --git a/receiver/chronyreceiver/config_test.go b/receiver/chronyreceiver/config_test.go index d2fda85fc916..d53303887867 100644 --- a/receiver/chronyreceiver/config_test.go +++ b/receiver/chronyreceiver/config_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver/internal/chrony" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver/internal/metadata" diff --git a/receiver/chronyreceiver/factory.go b/receiver/chronyreceiver/factory.go index ae9ba3591a5c..243e52c598b7 100644 --- a/receiver/chronyreceiver/factory.go +++ b/receiver/chronyreceiver/factory.go @@ -10,8 +10,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver/internal/chrony" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver/internal/metadata" diff --git a/receiver/chronyreceiver/factory_test.go b/receiver/chronyreceiver/factory_test.go index 45bd00f314d0..3d5e5550be7f 100644 --- a/receiver/chronyreceiver/factory_test.go +++ b/receiver/chronyreceiver/factory_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver/internal/metadata" ) diff --git a/receiver/chronyreceiver/go.mod b/receiver/chronyreceiver/go.mod index f47b190bce97..bce77a71d2e7 100644 --- a/receiver/chronyreceiver/go.mod +++ b/receiver/chronyreceiver/go.mod @@ -16,6 +16,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -45,7 +46,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect go.opentelemetry.io/otel/sdk v1.32.0 // indirect diff --git a/receiver/couchdbreceiver/config.go b/receiver/couchdbreceiver/config.go index cebd78f403ef..c366c8a7d21c 100644 --- a/receiver/couchdbreceiver/config.go +++ b/receiver/couchdbreceiver/config.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configopaque" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver/internal/metadata" diff --git a/receiver/couchdbreceiver/config_test.go b/receiver/couchdbreceiver/config_test.go index 7b151db62e0d..5ca7d32d59a7 100644 --- a/receiver/couchdbreceiver/config_test.go +++ b/receiver/couchdbreceiver/config_test.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver/internal/metadata" diff --git a/receiver/couchdbreceiver/factory.go b/receiver/couchdbreceiver/factory.go index f89780dff291..34ffae588a3e 100644 --- a/receiver/couchdbreceiver/factory.go +++ b/receiver/couchdbreceiver/factory.go @@ -12,8 +12,8 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver/internal/metadata" ) diff --git a/receiver/couchdbreceiver/go.mod b/receiver/couchdbreceiver/go.mod index 657a34b3379c..b5c00cde4a1a 100644 --- a/receiver/couchdbreceiver/go.mod +++ b/receiver/couchdbreceiver/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -61,7 +62,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect diff --git a/receiver/dockerstatsreceiver/config.go b/receiver/dockerstatsreceiver/config.go index 750560dbcf98..f961d791af12 100644 --- a/receiver/dockerstatsreceiver/config.go +++ b/receiver/dockerstatsreceiver/config.go @@ -6,7 +6,7 @@ package dockerstatsreceiver // import "github.com/open-telemetry/opentelemetry-c import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver/internal/metadata" diff --git a/receiver/dockerstatsreceiver/config_test.go b/receiver/dockerstatsreceiver/config_test.go index 30775206b092..a9f1a602287b 100644 --- a/receiver/dockerstatsreceiver/config_test.go +++ b/receiver/dockerstatsreceiver/config_test.go @@ -15,7 +15,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver/internal/metadata" diff --git a/receiver/dockerstatsreceiver/factory.go b/receiver/dockerstatsreceiver/factory.go index 56cf2cb1f0e5..7a5c611e32f4 100644 --- a/receiver/dockerstatsreceiver/factory.go +++ b/receiver/dockerstatsreceiver/factory.go @@ -10,8 +10,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver/internal/metadata" diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index eb80e5885875..69a65a2d716d 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -22,6 +22,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.opentelemetry.io/collector/semconv v0.116.1-0.20250107062214-ced38e8af2ae go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 @@ -86,7 +87,6 @@ require ( go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect diff --git a/receiver/dockerstatsreceiver/receiver_test.go b/receiver/dockerstatsreceiver/receiver_test.go index c610668aace9..65a52a572590 100644 --- a/receiver/dockerstatsreceiver/receiver_test.go +++ b/receiver/dockerstatsreceiver/receiver_test.go @@ -22,7 +22,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" diff --git a/receiver/elasticsearchreceiver/config.go b/receiver/elasticsearchreceiver/config.go index 7c81fc75350f..e3b454a35d41 100644 --- a/receiver/elasticsearchreceiver/config.go +++ b/receiver/elasticsearchreceiver/config.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configopaque" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver/internal/metadata" ) diff --git a/receiver/elasticsearchreceiver/config_test.go b/receiver/elasticsearchreceiver/config_test.go index 4d6974984246..8dfae0473858 100644 --- a/receiver/elasticsearchreceiver/config_test.go +++ b/receiver/elasticsearchreceiver/config_test.go @@ -16,7 +16,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver/internal/metadata" ) diff --git a/receiver/elasticsearchreceiver/factory.go b/receiver/elasticsearchreceiver/factory.go index 1482addf99a0..05fff7a8cd2b 100644 --- a/receiver/elasticsearchreceiver/factory.go +++ b/receiver/elasticsearchreceiver/factory.go @@ -12,8 +12,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver/internal/metadata" ) diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod index c27dcb4945cf..31c6871711c2 100644 --- a/receiver/elasticsearchreceiver/go.mod +++ b/receiver/elasticsearchreceiver/go.mod @@ -23,6 +23,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -94,7 +95,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect diff --git a/receiver/expvarreceiver/config.go b/receiver/expvarreceiver/config.go index fcd51334ea70..f29a4efa65c1 100644 --- a/receiver/expvarreceiver/config.go +++ b/receiver/expvarreceiver/config.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver/internal/metadata" ) diff --git a/receiver/expvarreceiver/config_test.go b/receiver/expvarreceiver/config_test.go index 0de3dceee678..d87be1f63ec8 100644 --- a/receiver/expvarreceiver/config_test.go +++ b/receiver/expvarreceiver/config_test.go @@ -15,7 +15,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver/internal/metadata" ) diff --git a/receiver/expvarreceiver/factory.go b/receiver/expvarreceiver/factory.go index e60059a7583e..8013c11943f1 100644 --- a/receiver/expvarreceiver/factory.go +++ b/receiver/expvarreceiver/factory.go @@ -11,8 +11,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver/internal/metadata" ) diff --git a/receiver/expvarreceiver/factory_test.go b/receiver/expvarreceiver/factory_test.go index 8c63291ea860..81347a01541d 100644 --- a/receiver/expvarreceiver/factory_test.go +++ b/receiver/expvarreceiver/factory_test.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver/internal/metadata" ) diff --git a/receiver/expvarreceiver/go.mod b/receiver/expvarreceiver/go.mod index 4d99ba40a04a..6a17a6f3f616 100644 --- a/receiver/expvarreceiver/go.mod +++ b/receiver/expvarreceiver/go.mod @@ -17,6 +17,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -58,7 +59,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 49e686eed89d..9e7d67a30d4f 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -59,7 +59,6 @@ require ( go.opentelemetry.io/collector/consumer/consumererror v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index 03af6f5bb103..2a0c779c5627 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -95,8 +95,6 @@ go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38 go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:dQnuZArB6AiD5p1zevGYrvn0KQFQ8WX/i5cffUdCrqA= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae h1:E6kmL+xRU8sV3Rouqxei+384CV+TlT6xHRKL+34orgo= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:wracOKvOenWibBm9XsObVGfZ0xp8ztogs731mE5iTrQ= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae h1:fGOr5NjORpu/jxjb0jkm/AdVhW1kbHtnqPa5Okl6RYk= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae/go.mod h1:yK3OycYduuhbbHaZ4cpolf6RZmkDv1kQHN+R7XEBKAI= go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae h1:vFpfVkM2ZqnFPMkZqwra9bMYbMCdHqrvrYV2s4c6bZ8= diff --git a/receiver/filestatsreceiver/config.go b/receiver/filestatsreceiver/config.go index 2eb6ae7decf7..3de02c58cf60 100644 --- a/receiver/filestatsreceiver/config.go +++ b/receiver/filestatsreceiver/config.go @@ -6,7 +6,7 @@ package filestatsreceiver // import "github.com/open-telemetry/opentelemetry-col import ( "errors" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver/internal/metadata" ) diff --git a/receiver/filestatsreceiver/config_test.go b/receiver/filestatsreceiver/config_test.go index 03b0771c3c8c..1d36458c178a 100644 --- a/receiver/filestatsreceiver/config_test.go +++ b/receiver/filestatsreceiver/config_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" ) func Test_Config_Validate(t *testing.T) { diff --git a/receiver/filestatsreceiver/factory.go b/receiver/filestatsreceiver/factory.go index 3dfcd5bee1ed..b93dde63dec7 100644 --- a/receiver/filestatsreceiver/factory.go +++ b/receiver/filestatsreceiver/factory.go @@ -9,8 +9,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver/internal/metadata" ) diff --git a/receiver/filestatsreceiver/go.mod b/receiver/filestatsreceiver/go.mod index 2e25f243b426..c7a8e2d3e5bd 100644 --- a/receiver/filestatsreceiver/go.mod +++ b/receiver/filestatsreceiver/go.mod @@ -18,6 +18,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -83,7 +84,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect diff --git a/receiver/flinkmetricsreceiver/config.go b/receiver/flinkmetricsreceiver/config.go index 721214338064..55261e19ea39 100644 --- a/receiver/flinkmetricsreceiver/config.go +++ b/receiver/flinkmetricsreceiver/config.go @@ -8,7 +8,7 @@ import ( "net/url" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver/internal/metadata" ) diff --git a/receiver/flinkmetricsreceiver/config_test.go b/receiver/flinkmetricsreceiver/config_test.go index 68b137fa728e..08fbd6e07970 100644 --- a/receiver/flinkmetricsreceiver/config_test.go +++ b/receiver/flinkmetricsreceiver/config_test.go @@ -14,7 +14,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver/internal/metadata" ) diff --git a/receiver/flinkmetricsreceiver/factory.go b/receiver/flinkmetricsreceiver/factory.go index c28dc8d9c837..0c5a93d72400 100644 --- a/receiver/flinkmetricsreceiver/factory.go +++ b/receiver/flinkmetricsreceiver/factory.go @@ -12,8 +12,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver/internal/metadata" ) diff --git a/receiver/flinkmetricsreceiver/factory_test.go b/receiver/flinkmetricsreceiver/factory_test.go index be87adb43a46..d6b0f077242a 100644 --- a/receiver/flinkmetricsreceiver/factory_test.go +++ b/receiver/flinkmetricsreceiver/factory_test.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver/internal/metadata" ) diff --git a/receiver/flinkmetricsreceiver/go.mod b/receiver/flinkmetricsreceiver/go.mod index 53ab605a4c2e..4ce4b8bd8ee3 100644 --- a/receiver/flinkmetricsreceiver/go.mod +++ b/receiver/flinkmetricsreceiver/go.mod @@ -19,6 +19,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -60,7 +61,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect diff --git a/receiver/githubreceiver/config.go b/receiver/githubreceiver/config.go index adad61f2a069..4745c73fb0fe 100755 --- a/receiver/githubreceiver/config.go +++ b/receiver/githubreceiver/config.go @@ -11,7 +11,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/githubreceiver/internal" diff --git a/receiver/githubreceiver/config_test.go b/receiver/githubreceiver/config_test.go index 5c310c84fe97..52c5cfd75654 100644 --- a/receiver/githubreceiver/config_test.go +++ b/receiver/githubreceiver/config_test.go @@ -14,7 +14,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/otelcol/otelcoltest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/githubreceiver/internal" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/githubreceiver/internal/metadata" diff --git a/receiver/githubreceiver/factory.go b/receiver/githubreceiver/factory.go index 285b77a99f07..c6d98bae4239 100644 --- a/receiver/githubreceiver/factory.go +++ b/receiver/githubreceiver/factory.go @@ -13,8 +13,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/githubreceiver/internal" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/githubreceiver/internal/metadata" diff --git a/receiver/githubreceiver/go.mod b/receiver/githubreceiver/go.mod index 8ea1cd0adf2d..060f705e716b 100644 --- a/receiver/githubreceiver/go.mod +++ b/receiver/githubreceiver/go.mod @@ -24,6 +24,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.opentelemetry.io/collector/semconv v0.116.1-0.20250107062214-ced38e8af2ae go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 @@ -108,7 +109,6 @@ require ( go.opentelemetry.io/collector/processor/processortest v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/processor/xprocessor v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/collector/service v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 // indirect go.opentelemetry.io/contrib/config v0.10.0 // indirect diff --git a/receiver/googlecloudmonitoringreceiver/config.go b/receiver/googlecloudmonitoringreceiver/config.go index 4b0a3d13cce4..49c908d592f2 100644 --- a/receiver/googlecloudmonitoringreceiver/config.go +++ b/receiver/googlecloudmonitoringreceiver/config.go @@ -8,7 +8,7 @@ import ( "fmt" "time" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" ) const ( diff --git a/receiver/googlecloudmonitoringreceiver/config_test.go b/receiver/googlecloudmonitoringreceiver/config_test.go index 36f09b2ac756..b96ed7aeb3bd 100644 --- a/receiver/googlecloudmonitoringreceiver/config_test.go +++ b/receiver/googlecloudmonitoringreceiver/config_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudmonitoringreceiver/internal/metadata" ) diff --git a/receiver/googlecloudmonitoringreceiver/factory.go b/receiver/googlecloudmonitoringreceiver/factory.go index 28ca898339e3..77466fab46bd 100644 --- a/receiver/googlecloudmonitoringreceiver/factory.go +++ b/receiver/googlecloudmonitoringreceiver/factory.go @@ -9,8 +9,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudmonitoringreceiver/internal/metadata" ) diff --git a/receiver/googlecloudmonitoringreceiver/go.mod b/receiver/googlecloudmonitoringreceiver/go.mod index b04b019848bd..515f094c917e 100644 --- a/receiver/googlecloudmonitoringreceiver/go.mod +++ b/receiver/googlecloudmonitoringreceiver/go.mod @@ -12,6 +12,7 @@ require ( go.opentelemetry.io/collector/pdata v1.22.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/zap v1.27.0 golang.org/x/oauth2 v0.24.0 google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 @@ -29,7 +30,6 @@ require ( go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect golang.org/x/crypto v0.31.0 // indirect golang.org/x/sync v0.10.0 // indirect diff --git a/receiver/googlecloudspannerreceiver/config.go b/receiver/googlecloudspannerreceiver/config.go index ae88f0b00c9c..24dfadfaaa1c 100644 --- a/receiver/googlecloudspannerreceiver/config.go +++ b/receiver/googlecloudspannerreceiver/config.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" ) const ( diff --git a/receiver/googlecloudspannerreceiver/config_test.go b/receiver/googlecloudspannerreceiver/config_test.go index fb7670b941a4..301012998ac9 100644 --- a/receiver/googlecloudspannerreceiver/config_test.go +++ b/receiver/googlecloudspannerreceiver/config_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver/internal/metadata" ) diff --git a/receiver/googlecloudspannerreceiver/factory.go b/receiver/googlecloudspannerreceiver/factory.go index f3b28aa4f33a..c921f77a98be 100644 --- a/receiver/googlecloudspannerreceiver/factory.go +++ b/receiver/googlecloudspannerreceiver/factory.go @@ -10,8 +10,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver/internal/metadata" ) diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index da03c290908e..d8defefdf12c 100644 --- a/receiver/googlecloudspannerreceiver/go.mod +++ b/receiver/googlecloudspannerreceiver/go.mod @@ -16,6 +16,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -70,7 +71,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/detectors/gcp v1.31.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect diff --git a/receiver/haproxyreceiver/config.go b/receiver/haproxyreceiver/config.go index ec1636686e3c..98507ade3818 100644 --- a/receiver/haproxyreceiver/config.go +++ b/receiver/haproxyreceiver/config.go @@ -7,7 +7,7 @@ import ( "errors" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/haproxyreceiver/internal/metadata" ) diff --git a/receiver/haproxyreceiver/factory.go b/receiver/haproxyreceiver/factory.go index 7d077af8d6e3..393285948bee 100644 --- a/receiver/haproxyreceiver/factory.go +++ b/receiver/haproxyreceiver/factory.go @@ -9,8 +9,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/haproxyreceiver/internal/metadata" ) diff --git a/receiver/haproxyreceiver/go.mod b/receiver/haproxyreceiver/go.mod index d6dd75eb1c92..803c5f4f4e2b 100644 --- a/receiver/haproxyreceiver/go.mod +++ b/receiver/haproxyreceiver/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -93,7 +94,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect diff --git a/receiver/hostmetricsreceiver/config.go b/receiver/hostmetricsreceiver/config.go index 04412bc6fbfe..f4adbf86077a 100644 --- a/receiver/hostmetricsreceiver/config.go +++ b/receiver/hostmetricsreceiver/config.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" diff --git a/receiver/hostmetricsreceiver/config_test.go b/receiver/hostmetricsreceiver/config_test.go index 8c9e228eaa2b..48d655eaa0c6 100644 --- a/receiver/hostmetricsreceiver/config_test.go +++ b/receiver/hostmetricsreceiver/config_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterset" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" diff --git a/receiver/hostmetricsreceiver/factory.go b/receiver/hostmetricsreceiver/factory.go index 8efe4c907527..0fac30742796 100644 --- a/receiver/hostmetricsreceiver/factory.go +++ b/receiver/hostmetricsreceiver/factory.go @@ -13,8 +13,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/metadata" diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index f16cce111680..f4264912ddf6 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -25,6 +25,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.opentelemetry.io/collector/semconv v0.116.1-0.20250107062214-ced38e8af2ae go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 @@ -97,7 +98,6 @@ require ( go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.31.0 // indirect diff --git a/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go b/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go index 6c58e81dc063..482bd84bc461 100644 --- a/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go +++ b/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go @@ -19,8 +19,8 @@ import ( "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" conventions "go.opentelemetry.io/collector/semconv/v1.9.0" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal" diff --git a/receiver/httpcheckreceiver/config.go b/receiver/httpcheckreceiver/config.go index 61019aca3515..e51da527952c 100644 --- a/receiver/httpcheckreceiver/config.go +++ b/receiver/httpcheckreceiver/config.go @@ -9,7 +9,7 @@ import ( "net/url" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver/internal/metadata" diff --git a/receiver/httpcheckreceiver/config_test.go b/receiver/httpcheckreceiver/config_test.go index eb77a724c4d5..e7140f236ecd 100644 --- a/receiver/httpcheckreceiver/config_test.go +++ b/receiver/httpcheckreceiver/config_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" ) diff --git a/receiver/httpcheckreceiver/factory.go b/receiver/httpcheckreceiver/factory.go index 7c0fec3cbf77..b59d229d9b0f 100644 --- a/receiver/httpcheckreceiver/factory.go +++ b/receiver/httpcheckreceiver/factory.go @@ -11,8 +11,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver/internal/metadata" ) diff --git a/receiver/httpcheckreceiver/factory_test.go b/receiver/httpcheckreceiver/factory_test.go index 470a39c68e14..d6b27c6b02f3 100644 --- a/receiver/httpcheckreceiver/factory_test.go +++ b/receiver/httpcheckreceiver/factory_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver/internal/metadata" ) diff --git a/receiver/httpcheckreceiver/go.mod b/receiver/httpcheckreceiver/go.mod index f4d18652144b..0800c7ab6055 100644 --- a/receiver/httpcheckreceiver/go.mod +++ b/receiver/httpcheckreceiver/go.mod @@ -18,6 +18,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -59,7 +60,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect diff --git a/receiver/huaweicloudcesreceiver/config.go b/receiver/huaweicloudcesreceiver/config.go index e5583b1ee314..f8bb75547009 100644 --- a/receiver/huaweicloudcesreceiver/config.go +++ b/receiver/huaweicloudcesreceiver/config.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configretry" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" ) diff --git a/receiver/huaweicloudcesreceiver/go.mod b/receiver/huaweicloudcesreceiver/go.mod index 464f2a901d3e..02518b89f1d3 100644 --- a/receiver/huaweicloudcesreceiver/go.mod +++ b/receiver/huaweicloudcesreceiver/go.mod @@ -19,6 +19,7 @@ require ( go.opentelemetry.io/collector/pdata v1.22.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -64,7 +65,6 @@ require ( go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect diff --git a/receiver/huaweicloudcesreceiver/receiver_test.go b/receiver/huaweicloudcesreceiver/receiver_test.go index 267f0f699a6d..5a00b2f3188c 100644 --- a/receiver/huaweicloudcesreceiver/receiver_test.go +++ b/receiver/huaweicloudcesreceiver/receiver_test.go @@ -16,7 +16,7 @@ import ( "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/zap/zaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/huaweicloudcesreceiver/internal/mocks" diff --git a/receiver/iisreceiver/config.go b/receiver/iisreceiver/config.go index 1fda19f16040..214f939c3f1c 100644 --- a/receiver/iisreceiver/config.go +++ b/receiver/iisreceiver/config.go @@ -4,7 +4,7 @@ package iisreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver" import ( - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver/internal/metadata" ) diff --git a/receiver/iisreceiver/factory.go b/receiver/iisreceiver/factory.go index 8f2c033a90a5..cfef3ce62c5e 100644 --- a/receiver/iisreceiver/factory.go +++ b/receiver/iisreceiver/factory.go @@ -6,7 +6,7 @@ package iisreceiver // import "github.com/open-telemetry/opentelemetry-collector import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver/internal/metadata" ) diff --git a/receiver/iisreceiver/factory_test.go b/receiver/iisreceiver/factory_test.go index 2adc27573076..74ecf434c576 100644 --- a/receiver/iisreceiver/factory_test.go +++ b/receiver/iisreceiver/factory_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver/internal/metadata" ) diff --git a/receiver/iisreceiver/factory_windows.go b/receiver/iisreceiver/factory_windows.go index 1de490cc5fda..7cf0da3e8913 100644 --- a/receiver/iisreceiver/factory_windows.go +++ b/receiver/iisreceiver/factory_windows.go @@ -11,8 +11,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver/internal/metadata" ) diff --git a/receiver/iisreceiver/go.mod b/receiver/iisreceiver/go.mod index b415d5138aaf..d65fb524e0fb 100644 --- a/receiver/iisreceiver/go.mod +++ b/receiver/iisreceiver/go.mod @@ -19,6 +19,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -83,7 +84,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect diff --git a/receiver/journaldreceiver/go.mod b/receiver/journaldreceiver/go.mod index 809e22243301..7e06fbf61766 100644 --- a/receiver/journaldreceiver/go.mod +++ b/receiver/journaldreceiver/go.mod @@ -53,7 +53,6 @@ require ( go.opentelemetry.io/collector/consumer/consumererror v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pdata v1.22.1-0.20250107062214-ced38e8af2ae // indirect diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum index 0c70105b4c55..dd1f9032fb0a 100644 --- a/receiver/journaldreceiver/go.sum +++ b/receiver/journaldreceiver/go.sum @@ -91,8 +91,6 @@ go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38 go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:dQnuZArB6AiD5p1zevGYrvn0KQFQ8WX/i5cffUdCrqA= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae h1:E6kmL+xRU8sV3Rouqxei+384CV+TlT6xHRKL+34orgo= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:wracOKvOenWibBm9XsObVGfZ0xp8ztogs731mE5iTrQ= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae h1:fGOr5NjORpu/jxjb0jkm/AdVhW1kbHtnqPa5Okl6RYk= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae/go.mod h1:yK3OycYduuhbbHaZ4cpolf6RZmkDv1kQHN+R7XEBKAI= go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae h1:vFpfVkM2ZqnFPMkZqwra9bMYbMCdHqrvrYV2s4c6bZ8= diff --git a/receiver/kafkametricsreceiver/config.go b/receiver/kafkametricsreceiver/config.go index 8b45224ea486..e5ecaa262e57 100644 --- a/receiver/kafkametricsreceiver/config.go +++ b/receiver/kafkametricsreceiver/config.go @@ -4,7 +4,7 @@ package kafkametricsreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver" import ( - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver/internal/metadata" diff --git a/receiver/kafkametricsreceiver/config_test.go b/receiver/kafkametricsreceiver/config_test.go index 63506b66c2ab..a19d361856e4 100644 --- a/receiver/kafkametricsreceiver/config_test.go +++ b/receiver/kafkametricsreceiver/config_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver/internal/metadata" diff --git a/receiver/kafkametricsreceiver/factory.go b/receiver/kafkametricsreceiver/factory.go index 551ea684c080..522804a1a324 100644 --- a/receiver/kafkametricsreceiver/factory.go +++ b/receiver/kafkametricsreceiver/factory.go @@ -9,7 +9,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver/internal/metadata" ) diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index 69009aa2b6ae..a7762f578c7d 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -18,6 +18,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -82,7 +83,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect go.opentelemetry.io/otel/sdk v1.32.0 // indirect diff --git a/receiver/kafkametricsreceiver/receiver.go b/receiver/kafkametricsreceiver/receiver.go index 0032c762591a..1e58fc4bd5c4 100644 --- a/receiver/kafkametricsreceiver/receiver.go +++ b/receiver/kafkametricsreceiver/receiver.go @@ -11,8 +11,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver/internal/metadata" diff --git a/receiver/kubeletstatsreceiver/config.go b/receiver/kubeletstatsreceiver/config.go index f06bd3c051dd..975cd241bf20 100644 --- a/receiver/kubeletstatsreceiver/config.go +++ b/receiver/kubeletstatsreceiver/config.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/confmap" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "k8s.io/client-go/kubernetes" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" diff --git a/receiver/kubeletstatsreceiver/config_test.go b/receiver/kubeletstatsreceiver/config_test.go index 03290d362cd5..0a6285e43852 100644 --- a/receiver/kubeletstatsreceiver/config_test.go +++ b/receiver/kubeletstatsreceiver/config_test.go @@ -14,7 +14,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" kube "github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet" diff --git a/receiver/kubeletstatsreceiver/factory.go b/receiver/kubeletstatsreceiver/factory.go index fdab5c93e6ce..4ae2e9f39567 100644 --- a/receiver/kubeletstatsreceiver/factory.go +++ b/receiver/kubeletstatsreceiver/factory.go @@ -11,7 +11,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" diff --git a/receiver/kubeletstatsreceiver/factory_test.go b/receiver/kubeletstatsreceiver/factory_test.go index 88a938fe9a01..4bb5ea5b9131 100644 --- a/receiver/kubeletstatsreceiver/factory_test.go +++ b/receiver/kubeletstatsreceiver/factory_test.go @@ -20,7 +20,7 @@ import ( "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pipeline" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig" diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 4e871e889c5b..6cad15d37666 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -26,6 +26,7 @@ require ( go.opentelemetry.io/collector/receiver/otlpreceiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.opentelemetry.io/collector/semconv v0.116.1-0.20250107062214-ced38e8af2ae go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 @@ -104,7 +105,6 @@ require ( go.opentelemetry.io/collector/internal/sharedcomponent v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect diff --git a/receiver/memcachedreceiver/config.go b/receiver/memcachedreceiver/config.go index 9c8cb093f7c6..9fc4ef8cfb99 100644 --- a/receiver/memcachedreceiver/config.go +++ b/receiver/memcachedreceiver/config.go @@ -5,7 +5,7 @@ package memcachedreceiver // import "github.com/open-telemetry/opentelemetry-col import ( "go.opentelemetry.io/collector/config/confignet" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver/internal/metadata" ) diff --git a/receiver/memcachedreceiver/factory.go b/receiver/memcachedreceiver/factory.go index 493e474ee7eb..cd200c439e39 100644 --- a/receiver/memcachedreceiver/factory.go +++ b/receiver/memcachedreceiver/factory.go @@ -11,8 +11,8 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver/internal/metadata" ) diff --git a/receiver/memcachedreceiver/factory_test.go b/receiver/memcachedreceiver/factory_test.go index 0d95b9bdb565..711dcb655500 100644 --- a/receiver/memcachedreceiver/factory_test.go +++ b/receiver/memcachedreceiver/factory_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver/internal/metadata" ) diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index 90fb39ab251c..deb5fcc9849c 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -82,7 +83,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect diff --git a/receiver/mongodbatlasreceiver/access_logs.go b/receiver/mongodbatlasreceiver/access_logs.go index b34606ed30fb..714f8835164b 100644 --- a/receiver/mongodbatlasreceiver/access_logs.go +++ b/receiver/mongodbatlasreceiver/access_logs.go @@ -13,7 +13,7 @@ import ( "go.mongodb.org/atlas/mongodbatlas" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" rcvr "go.opentelemetry.io/collector/receiver" diff --git a/receiver/mongodbatlasreceiver/access_logs_integration_test.go b/receiver/mongodbatlasreceiver/access_logs_integration_test.go index 486efe64a48d..23c082754207 100644 --- a/receiver/mongodbatlasreceiver/access_logs_integration_test.go +++ b/receiver/mongodbatlasreceiver/access_logs_integration_test.go @@ -19,7 +19,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/plogtest" diff --git a/receiver/mongodbatlasreceiver/access_logs_test.go b/receiver/mongodbatlasreceiver/access_logs_test.go index 98b135ab7a97..bdb2cc92c902 100644 --- a/receiver/mongodbatlasreceiver/access_logs_test.go +++ b/receiver/mongodbatlasreceiver/access_logs_test.go @@ -17,11 +17,11 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/zap/zaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/plogtest" diff --git a/receiver/mongodbatlasreceiver/alerts.go b/receiver/mongodbatlasreceiver/alerts.go index 995f654f7e44..b6c20ed40a61 100644 --- a/receiver/mongodbatlasreceiver/alerts.go +++ b/receiver/mongodbatlasreceiver/alerts.go @@ -26,7 +26,7 @@ import ( "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" rcvr "go.opentelemetry.io/collector/receiver" diff --git a/receiver/mongodbatlasreceiver/alerts_test.go b/receiver/mongodbatlasreceiver/alerts_test.go index 63419170cbf5..2e5a6884cc01 100644 --- a/receiver/mongodbatlasreceiver/alerts_test.go +++ b/receiver/mongodbatlasreceiver/alerts_test.go @@ -24,11 +24,11 @@ import ( "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/zap/zaptest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/plogtest" diff --git a/receiver/mongodbatlasreceiver/config.go b/receiver/mongodbatlasreceiver/config.go index ce16f22cbd55..44ac13fd7259 100644 --- a/receiver/mongodbatlasreceiver/config.go +++ b/receiver/mongodbatlasreceiver/config.go @@ -14,7 +14,7 @@ import ( "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/config/configtls" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal/metadata" diff --git a/receiver/mongodbatlasreceiver/config_test.go b/receiver/mongodbatlasreceiver/config_test.go index a2932e213306..9fb9a2a4c4b7 100644 --- a/receiver/mongodbatlasreceiver/config_test.go +++ b/receiver/mongodbatlasreceiver/config_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal/metadata" ) diff --git a/receiver/mongodbatlasreceiver/events.go b/receiver/mongodbatlasreceiver/events.go index 7b9ed58557ce..2cec9cc3a040 100644 --- a/receiver/mongodbatlasreceiver/events.go +++ b/receiver/mongodbatlasreceiver/events.go @@ -14,7 +14,7 @@ import ( "go.mongodb.org/atlas/mongodbatlas" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" rcvr "go.opentelemetry.io/collector/receiver" diff --git a/receiver/mongodbatlasreceiver/events_test.go b/receiver/mongodbatlasreceiver/events_test.go index 089a51543e14..f8c48d3847bf 100644 --- a/receiver/mongodbatlasreceiver/events_test.go +++ b/receiver/mongodbatlasreceiver/events_test.go @@ -18,7 +18,7 @@ import ( "go.mongodb.org/atlas/mongodbatlas" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" "go.opentelemetry.io/collector/receiver/receivertest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" diff --git a/receiver/mongodbatlasreceiver/factory.go b/receiver/mongodbatlasreceiver/factory.go index ff838128b31f..d4ed4b123599 100644 --- a/receiver/mongodbatlasreceiver/factory.go +++ b/receiver/mongodbatlasreceiver/factory.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver/internal/metadata" ) diff --git a/receiver/mongodbatlasreceiver/go.mod b/receiver/mongodbatlasreceiver/go.mod index f56eb63c38e2..495e8c77e670 100644 --- a/receiver/mongodbatlasreceiver/go.mod +++ b/receiver/mongodbatlasreceiver/go.mod @@ -34,9 +34,10 @@ require ( require ( go.opentelemetry.io/collector/component/componenttest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/consumer/consumertest v0.116.1-0.20250107062214-ced38e8af2ae - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/extension/xextension v0.116.0 go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 ) require ( @@ -72,12 +73,10 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/consumer/consumererror v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/sdk v1.32.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index fd2e4fea4552..96db1f6ce98e 100644 --- a/receiver/mongodbatlasreceiver/go.sum +++ b/receiver/mongodbatlasreceiver/go.sum @@ -110,8 +110,6 @@ go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38 go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:dQnuZArB6AiD5p1zevGYrvn0KQFQ8WX/i5cffUdCrqA= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae h1:E6kmL+xRU8sV3Rouqxei+384CV+TlT6xHRKL+34orgo= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:wracOKvOenWibBm9XsObVGfZ0xp8ztogs731mE5iTrQ= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae h1:fGOr5NjORpu/jxjb0jkm/AdVhW1kbHtnqPa5Okl6RYk= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae/go.mod h1:yK3OycYduuhbbHaZ4cpolf6RZmkDv1kQHN+R7XEBKAI= go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae h1:vFpfVkM2ZqnFPMkZqwra9bMYbMCdHqrvrYV2s4c6bZ8= diff --git a/receiver/mongodbreceiver/config.go b/receiver/mongodbreceiver/config.go index 17539c93d980..4d89797d324e 100644 --- a/receiver/mongodbreceiver/config.go +++ b/receiver/mongodbreceiver/config.go @@ -14,7 +14,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configtls" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver/internal/metadata" diff --git a/receiver/mongodbreceiver/config_test.go b/receiver/mongodbreceiver/config_test.go index b5c3bced8297..21f69c114092 100644 --- a/receiver/mongodbreceiver/config_test.go +++ b/receiver/mongodbreceiver/config_test.go @@ -15,7 +15,7 @@ import ( "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver/internal/metadata" ) diff --git a/receiver/mongodbreceiver/factory.go b/receiver/mongodbreceiver/factory.go index 7fcebb7a510a..ac020050aba3 100644 --- a/receiver/mongodbreceiver/factory.go +++ b/receiver/mongodbreceiver/factory.go @@ -13,8 +13,8 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver/internal/metadata" ) diff --git a/receiver/mongodbreceiver/factory_test.go b/receiver/mongodbreceiver/factory_test.go index 8263a204ece8..54002f0b67f8 100644 --- a/receiver/mongodbreceiver/factory_test.go +++ b/receiver/mongodbreceiver/factory_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbreceiver/internal/metadata" ) diff --git a/receiver/mongodbreceiver/go.mod b/receiver/mongodbreceiver/go.mod index 55760991b5ac..e3f373374ce4 100644 --- a/receiver/mongodbreceiver/go.mod +++ b/receiver/mongodbreceiver/go.mod @@ -25,6 +25,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -96,7 +97,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect diff --git a/receiver/mysqlreceiver/config.go b/receiver/mysqlreceiver/config.go index a6e6ab6320a8..75d9bfc79978 100644 --- a/receiver/mysqlreceiver/config.go +++ b/receiver/mysqlreceiver/config.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver/internal/metadata" ) diff --git a/receiver/mysqlreceiver/factory.go b/receiver/mysqlreceiver/factory.go index d18d41fc966c..50a07214b752 100644 --- a/receiver/mysqlreceiver/factory.go +++ b/receiver/mysqlreceiver/factory.go @@ -11,8 +11,8 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver/internal/metadata" ) diff --git a/receiver/mysqlreceiver/factory_test.go b/receiver/mysqlreceiver/factory_test.go index 518f06f52721..d6d6c549edcd 100644 --- a/receiver/mysqlreceiver/factory_test.go +++ b/receiver/mysqlreceiver/factory_test.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver/internal/metadata" ) diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index 7fdab169434b..09f67b64646a 100644 --- a/receiver/mysqlreceiver/go.mod +++ b/receiver/mysqlreceiver/go.mod @@ -22,6 +22,7 @@ require ( go.opentelemetry.io/collector/pdata v1.22.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -32,7 +33,6 @@ require ( go.opentelemetry.io/collector/consumer/consumererror v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect ) diff --git a/receiver/namedpipereceiver/go.mod b/receiver/namedpipereceiver/go.mod index b35a337d4c97..efd3b10378b3 100644 --- a/receiver/namedpipereceiver/go.mod +++ b/receiver/namedpipereceiver/go.mod @@ -53,7 +53,6 @@ require ( go.opentelemetry.io/collector/consumer/consumererror v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pdata v1.22.1-0.20250107062214-ced38e8af2ae // indirect diff --git a/receiver/namedpipereceiver/go.sum b/receiver/namedpipereceiver/go.sum index 374541c0698b..9bdab82582f6 100644 --- a/receiver/namedpipereceiver/go.sum +++ b/receiver/namedpipereceiver/go.sum @@ -93,8 +93,6 @@ go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38 go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:dQnuZArB6AiD5p1zevGYrvn0KQFQ8WX/i5cffUdCrqA= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae h1:E6kmL+xRU8sV3Rouqxei+384CV+TlT6xHRKL+34orgo= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:wracOKvOenWibBm9XsObVGfZ0xp8ztogs731mE5iTrQ= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae h1:fGOr5NjORpu/jxjb0jkm/AdVhW1kbHtnqPa5Okl6RYk= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae/go.mod h1:yK3OycYduuhbbHaZ4cpolf6RZmkDv1kQHN+R7XEBKAI= go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae h1:vFpfVkM2ZqnFPMkZqwra9bMYbMCdHqrvrYV2s4c6bZ8= diff --git a/receiver/nginxreceiver/config.go b/receiver/nginxreceiver/config.go index 4a81800a208f..d9e10d1ca3ad 100644 --- a/receiver/nginxreceiver/config.go +++ b/receiver/nginxreceiver/config.go @@ -5,7 +5,7 @@ package nginxreceiver // import "github.com/open-telemetry/opentelemetry-collect import ( "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver/internal/metadata" ) diff --git a/receiver/nginxreceiver/factory.go b/receiver/nginxreceiver/factory.go index f2bc9caac453..fbca193284fb 100644 --- a/receiver/nginxreceiver/factory.go +++ b/receiver/nginxreceiver/factory.go @@ -11,8 +11,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver/internal/metadata" ) diff --git a/receiver/nginxreceiver/factory_test.go b/receiver/nginxreceiver/factory_test.go index ca802be3c8cd..c76572b81253 100644 --- a/receiver/nginxreceiver/factory_test.go +++ b/receiver/nginxreceiver/factory_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver/internal/metadata" ) diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 47a1aa17f43a..c02f6aa2f168 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -21,6 +21,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -92,7 +93,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect diff --git a/receiver/nsxtreceiver/config.go b/receiver/nsxtreceiver/config.go index a3ad6a685541..7e74ccb0cf08 100644 --- a/receiver/nsxtreceiver/config.go +++ b/receiver/nsxtreceiver/config.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configopaque" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver/internal/metadata" diff --git a/receiver/nsxtreceiver/config_test.go b/receiver/nsxtreceiver/config_test.go index a29b64eafc91..aaae7b13847b 100644 --- a/receiver/nsxtreceiver/config_test.go +++ b/receiver/nsxtreceiver/config_test.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver/internal/metadata" ) diff --git a/receiver/nsxtreceiver/factory.go b/receiver/nsxtreceiver/factory.go index c48be10d1c90..8cfa9927956c 100644 --- a/receiver/nsxtreceiver/factory.go +++ b/receiver/nsxtreceiver/factory.go @@ -10,8 +10,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver/internal/metadata" ) diff --git a/receiver/nsxtreceiver/factory_test.go b/receiver/nsxtreceiver/factory_test.go index bd069d1fe060..134ed85e8e8e 100644 --- a/receiver/nsxtreceiver/factory_test.go +++ b/receiver/nsxtreceiver/factory_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver/internal/metadata" ) diff --git a/receiver/nsxtreceiver/go.mod b/receiver/nsxtreceiver/go.mod index 50639c9eb9b4..816a335f39b8 100644 --- a/receiver/nsxtreceiver/go.mod +++ b/receiver/nsxtreceiver/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -62,7 +63,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect diff --git a/receiver/ntpreceiver/config.go b/receiver/ntpreceiver/config.go index 934d3df77021..b0b3bc7e8c88 100644 --- a/receiver/ntpreceiver/config.go +++ b/receiver/ntpreceiver/config.go @@ -9,7 +9,7 @@ import ( "net" "time" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/ntpreceiver/internal/metadata" ) diff --git a/receiver/ntpreceiver/config_test.go b/receiver/ntpreceiver/config_test.go index 1ba68eec7f26..59926ef06765 100644 --- a/receiver/ntpreceiver/config_test.go +++ b/receiver/ntpreceiver/config_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" ) func TestValidate(t *testing.T) { diff --git a/receiver/ntpreceiver/factory.go b/receiver/ntpreceiver/factory.go index d4880e295407..e21586b0e495 100644 --- a/receiver/ntpreceiver/factory.go +++ b/receiver/ntpreceiver/factory.go @@ -10,8 +10,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/ntpreceiver/internal/metadata" ) diff --git a/receiver/ntpreceiver/go.mod b/receiver/ntpreceiver/go.mod index ab5d5e3cfcff..bc5b5d9b0208 100644 --- a/receiver/ntpreceiver/go.mod +++ b/receiver/ntpreceiver/go.mod @@ -16,6 +16,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -43,7 +44,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect go.opentelemetry.io/otel/sdk v1.32.0 // indirect diff --git a/receiver/oracledbreceiver/config.go b/receiver/oracledbreceiver/config.go index 70c21c2e9264..e243ca3670aa 100644 --- a/receiver/oracledbreceiver/config.go +++ b/receiver/oracledbreceiver/config.go @@ -10,7 +10,7 @@ import ( "net/url" "strconv" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver/internal/metadata" diff --git a/receiver/oracledbreceiver/config_test.go b/receiver/oracledbreceiver/config_test.go index 1e0593a05755..a07ba426b3e8 100644 --- a/receiver/oracledbreceiver/config_test.go +++ b/receiver/oracledbreceiver/config_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" ) func TestValidateInvalidConfigs(t *testing.T) { diff --git a/receiver/oracledbreceiver/factory.go b/receiver/oracledbreceiver/factory.go index 7246f8e16d14..68a98bb242a8 100644 --- a/receiver/oracledbreceiver/factory.go +++ b/receiver/oracledbreceiver/factory.go @@ -15,7 +15,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver/internal/metadata" ) diff --git a/receiver/oracledbreceiver/go.mod b/receiver/oracledbreceiver/go.mod index 554be39aac5c..aa253c6572b9 100644 --- a/receiver/oracledbreceiver/go.mod +++ b/receiver/oracledbreceiver/go.mod @@ -16,6 +16,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -44,7 +45,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect go.opentelemetry.io/otel/sdk v1.32.0 // indirect diff --git a/receiver/oracledbreceiver/scraper.go b/receiver/oracledbreceiver/scraper.go index 2079a6c73b0a..3a77b7b88d6b 100644 --- a/receiver/oracledbreceiver/scraper.go +++ b/receiver/oracledbreceiver/scraper.go @@ -13,9 +13,9 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" "go.opentelemetry.io/collector/scraper/scrapererror" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "go.uber.org/zap" diff --git a/receiver/osqueryreceiver/config.go b/receiver/osqueryreceiver/config.go index abddbecac074..b18ec6362952 100644 --- a/receiver/osqueryreceiver/config.go +++ b/receiver/osqueryreceiver/config.go @@ -8,7 +8,7 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" ) const ( diff --git a/receiver/osqueryreceiver/go.mod b/receiver/osqueryreceiver/go.mod index b9002ba63bc4..e462061e3c4d 100644 --- a/receiver/osqueryreceiver/go.mod +++ b/receiver/osqueryreceiver/go.mod @@ -7,6 +7,7 @@ require ( go.opentelemetry.io/collector/component v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/component/componenttest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 ) @@ -26,7 +27,6 @@ require ( go.opentelemetry.io/collector/pdata v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect go.opentelemetry.io/otel/sdk v1.32.0 // indirect diff --git a/receiver/otlpjsonfilereceiver/go.mod b/receiver/otlpjsonfilereceiver/go.mod index c6446064adf9..fdc07c97ba20 100644 --- a/receiver/otlpjsonfilereceiver/go.mod +++ b/receiver/otlpjsonfilereceiver/go.mod @@ -58,7 +58,6 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/consumer/consumererror v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect diff --git a/receiver/otlpjsonfilereceiver/go.sum b/receiver/otlpjsonfilereceiver/go.sum index b4e59b7e5d9e..a23105c580a4 100644 --- a/receiver/otlpjsonfilereceiver/go.sum +++ b/receiver/otlpjsonfilereceiver/go.sum @@ -95,8 +95,6 @@ go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38 go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:dQnuZArB6AiD5p1zevGYrvn0KQFQ8WX/i5cffUdCrqA= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae h1:E6kmL+xRU8sV3Rouqxei+384CV+TlT6xHRKL+34orgo= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:wracOKvOenWibBm9XsObVGfZ0xp8ztogs731mE5iTrQ= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae h1:fGOr5NjORpu/jxjb0jkm/AdVhW1kbHtnqPa5Okl6RYk= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae/go.mod h1:yK3OycYduuhbbHaZ4cpolf6RZmkDv1kQHN+R7XEBKAI= go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae h1:vFpfVkM2ZqnFPMkZqwra9bMYbMCdHqrvrYV2s4c6bZ8= diff --git a/receiver/podmanreceiver/config.go b/receiver/podmanreceiver/config.go index b59df15c7aad..d3e2c3fb7f66 100644 --- a/receiver/podmanreceiver/config.go +++ b/receiver/podmanreceiver/config.go @@ -8,7 +8,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configopaque" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver/internal/metadata" ) diff --git a/receiver/podmanreceiver/config_test.go b/receiver/podmanreceiver/config_test.go index c3c7a8fdde03..6b3bc0030d1d 100644 --- a/receiver/podmanreceiver/config_test.go +++ b/receiver/podmanreceiver/config_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver/internal/metadata" ) diff --git a/receiver/podmanreceiver/factory.go b/receiver/podmanreceiver/factory.go index f24b9c8a7f82..83d06b3b81c4 100644 --- a/receiver/podmanreceiver/factory.go +++ b/receiver/podmanreceiver/factory.go @@ -8,7 +8,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver/internal/metadata" ) diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index 375ba0f8f37e..7d3a483458e7 100644 --- a/receiver/podmanreceiver/go.mod +++ b/receiver/podmanreceiver/go.mod @@ -17,6 +17,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -45,7 +46,6 @@ require ( go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect go.opentelemetry.io/otel/sdk v1.32.0 // indirect diff --git a/receiver/podmanreceiver/podman_test.go b/receiver/podmanreceiver/podman_test.go index 5225b940a9cc..38e71892b071 100644 --- a/receiver/podmanreceiver/podman_test.go +++ b/receiver/podmanreceiver/podman_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/zap" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" diff --git a/receiver/podmanreceiver/receiver.go b/receiver/podmanreceiver/receiver.go index 9d2b9088588d..7d422b010dc5 100644 --- a/receiver/podmanreceiver/receiver.go +++ b/receiver/podmanreceiver/receiver.go @@ -16,9 +16,9 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" "go.opentelemetry.io/collector/scraper/scrapererror" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver/internal/metadata" diff --git a/receiver/podmanreceiver/receiver_test.go b/receiver/podmanreceiver/receiver_test.go index e14f660bc3b4..3f97a4ca6f75 100644 --- a/receiver/podmanreceiver/receiver_test.go +++ b/receiver/podmanreceiver/receiver_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/zap" ) diff --git a/receiver/postgresqlreceiver/config.go b/receiver/postgresqlreceiver/config.go index 6bd0ba5b817a..095c4801f28a 100644 --- a/receiver/postgresqlreceiver/config.go +++ b/receiver/postgresqlreceiver/config.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configtls" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver/internal/metadata" diff --git a/receiver/postgresqlreceiver/factory.go b/receiver/postgresqlreceiver/factory.go index 2a3a25466b56..d53349d9597c 100644 --- a/receiver/postgresqlreceiver/factory.go +++ b/receiver/postgresqlreceiver/factory.go @@ -12,8 +12,8 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver/internal/metadata" ) diff --git a/receiver/postgresqlreceiver/factory_test.go b/receiver/postgresqlreceiver/factory_test.go index 4e393e754d9c..245e1a2a057e 100644 --- a/receiver/postgresqlreceiver/factory_test.go +++ b/receiver/postgresqlreceiver/factory_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver/internal/metadata" ) diff --git a/receiver/postgresqlreceiver/go.mod b/receiver/postgresqlreceiver/go.mod index d08180c58b84..aa366393036b 100644 --- a/receiver/postgresqlreceiver/go.mod +++ b/receiver/postgresqlreceiver/go.mod @@ -25,6 +25,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -91,7 +92,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect diff --git a/receiver/rabbitmqreceiver/config.go b/receiver/rabbitmqreceiver/config.go index 6549234233bf..3479a8ae8b4d 100644 --- a/receiver/rabbitmqreceiver/config.go +++ b/receiver/rabbitmqreceiver/config.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configopaque" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver/internal/metadata" ) diff --git a/receiver/rabbitmqreceiver/factory.go b/receiver/rabbitmqreceiver/factory.go index 2dbaa8d06e05..592202b18d91 100644 --- a/receiver/rabbitmqreceiver/factory.go +++ b/receiver/rabbitmqreceiver/factory.go @@ -12,8 +12,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver/internal/metadata" ) diff --git a/receiver/rabbitmqreceiver/factory_test.go b/receiver/rabbitmqreceiver/factory_test.go index e523c4240460..2e9900df69cc 100644 --- a/receiver/rabbitmqreceiver/factory_test.go +++ b/receiver/rabbitmqreceiver/factory_test.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver/internal/metadata" ) diff --git a/receiver/rabbitmqreceiver/go.mod b/receiver/rabbitmqreceiver/go.mod index 10a8b4ec6342..9ac5777b7169 100644 --- a/receiver/rabbitmqreceiver/go.mod +++ b/receiver/rabbitmqreceiver/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -60,7 +61,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect diff --git a/receiver/redisreceiver/config.go b/receiver/redisreceiver/config.go index e466dd40ff26..c4d048f6394a 100644 --- a/receiver/redisreceiver/config.go +++ b/receiver/redisreceiver/config.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configtls" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver/internal/metadata" ) diff --git a/receiver/redisreceiver/config_test.go b/receiver/redisreceiver/config_test.go index 86b451ca59b6..8a5a1659dad6 100644 --- a/receiver/redisreceiver/config_test.go +++ b/receiver/redisreceiver/config_test.go @@ -14,7 +14,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver/internal/metadata" ) diff --git a/receiver/redisreceiver/factory.go b/receiver/redisreceiver/factory.go index 13735ddb9327..89a1b446cf99 100644 --- a/receiver/redisreceiver/factory.go +++ b/receiver/redisreceiver/factory.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver/internal/metadata" ) diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index 96a69f78b876..75f5bfc9c019 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -22,6 +22,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -87,7 +88,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect diff --git a/receiver/riakreceiver/config.go b/receiver/riakreceiver/config.go index ee6a77f01d8b..cc8978c13d1c 100644 --- a/receiver/riakreceiver/config.go +++ b/receiver/riakreceiver/config.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configopaque" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver/internal/metadata" diff --git a/receiver/riakreceiver/config_test.go b/receiver/riakreceiver/config_test.go index 97eaf508d23c..967f8978a856 100644 --- a/receiver/riakreceiver/config_test.go +++ b/receiver/riakreceiver/config_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" ) diff --git a/receiver/riakreceiver/factory.go b/receiver/riakreceiver/factory.go index 332920afddad..53deaa761a00 100644 --- a/receiver/riakreceiver/factory.go +++ b/receiver/riakreceiver/factory.go @@ -12,8 +12,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver/internal/metadata" ) diff --git a/receiver/riakreceiver/factory_test.go b/receiver/riakreceiver/factory_test.go index 1e13b8d07c9f..1346f3587229 100644 --- a/receiver/riakreceiver/factory_test.go +++ b/receiver/riakreceiver/factory_test.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver/internal/metadata" ) diff --git a/receiver/riakreceiver/go.mod b/receiver/riakreceiver/go.mod index 2b2730c68994..ad2f195c5209 100644 --- a/receiver/riakreceiver/go.mod +++ b/receiver/riakreceiver/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -61,7 +62,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect diff --git a/receiver/saphanareceiver/config.go b/receiver/saphanareceiver/config.go index fae91e22cb47..7a5850b5f174 100644 --- a/receiver/saphanareceiver/config.go +++ b/receiver/saphanareceiver/config.go @@ -9,7 +9,7 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configtls" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/saphanareceiver/internal/metadata" diff --git a/receiver/saphanareceiver/factory.go b/receiver/saphanareceiver/factory.go index 197fef3160b6..9ad5861225af 100644 --- a/receiver/saphanareceiver/factory.go +++ b/receiver/saphanareceiver/factory.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/saphanareceiver/internal/metadata" ) diff --git a/receiver/saphanareceiver/factory_test.go b/receiver/saphanareceiver/factory_test.go index 488b2ede1f75..0a2639221482 100644 --- a/receiver/saphanareceiver/factory_test.go +++ b/receiver/saphanareceiver/factory_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/saphanareceiver/internal/metadata" ) diff --git a/receiver/saphanareceiver/go.mod b/receiver/saphanareceiver/go.mod index f906cb64c9e4..2711996f09e3 100644 --- a/receiver/saphanareceiver/go.mod +++ b/receiver/saphanareceiver/go.mod @@ -21,6 +21,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -53,7 +54,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect go.opentelemetry.io/otel/sdk v1.32.0 // indirect diff --git a/receiver/snmpreceiver/config.go b/receiver/snmpreceiver/config.go index 08ae73a29034..2f43460e7d1a 100644 --- a/receiver/snmpreceiver/config.go +++ b/receiver/snmpreceiver/config.go @@ -10,7 +10,7 @@ import ( "time" "go.opentelemetry.io/collector/config/configopaque" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" ) // Config Defaults diff --git a/receiver/snmpreceiver/factory.go b/receiver/snmpreceiver/factory.go index 7cc7e675dcc1..403109815324 100644 --- a/receiver/snmpreceiver/factory.go +++ b/receiver/snmpreceiver/factory.go @@ -13,8 +13,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snmpreceiver/internal/metadata" ) diff --git a/receiver/snmpreceiver/factory_test.go b/receiver/snmpreceiver/factory_test.go index 41bd008a8dc1..049a6339df74 100644 --- a/receiver/snmpreceiver/factory_test.go +++ b/receiver/snmpreceiver/factory_test.go @@ -11,7 +11,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snmpreceiver/internal/metadata" ) diff --git a/receiver/snmpreceiver/go.mod b/receiver/snmpreceiver/go.mod index 6944a8837e87..bd008b3aa155 100644 --- a/receiver/snmpreceiver/go.mod +++ b/receiver/snmpreceiver/go.mod @@ -19,6 +19,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -118,7 +119,6 @@ require ( go.opentelemetry.io/collector/processor/processortest v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/processor/xprocessor v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/collector/semconv v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/service v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 // indirect diff --git a/receiver/snowflakereceiver/config.go b/receiver/snowflakereceiver/config.go index 289bc5d7e953..6898ffece9a2 100644 --- a/receiver/snowflakereceiver/config.go +++ b/receiver/snowflakereceiver/config.go @@ -7,7 +7,7 @@ import ( "errors" "go.opentelemetry.io/collector/config/configopaque" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snowflakereceiver/internal/metadata" diff --git a/receiver/snowflakereceiver/config_test.go b/receiver/snowflakereceiver/config_test.go index 2955da57e4a1..52441b045a77 100644 --- a/receiver/snowflakereceiver/config_test.go +++ b/receiver/snowflakereceiver/config_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snowflakereceiver/internal/metadata" diff --git a/receiver/snowflakereceiver/factory.go b/receiver/snowflakereceiver/factory.go index 30e76887c005..221622c89588 100644 --- a/receiver/snowflakereceiver/factory.go +++ b/receiver/snowflakereceiver/factory.go @@ -10,8 +10,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snowflakereceiver/internal/metadata" ) diff --git a/receiver/snowflakereceiver/go.mod b/receiver/snowflakereceiver/go.mod index 36ac73f55dd7..5d91b5a2cb87 100644 --- a/receiver/snowflakereceiver/go.mod +++ b/receiver/snowflakereceiver/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -87,7 +88,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect go.opentelemetry.io/otel/sdk v1.32.0 // indirect diff --git a/receiver/splunkenterprisereceiver/client_test.go b/receiver/splunkenterprisereceiver/client_test.go index f2008288bea9..981e8d9bb828 100644 --- a/receiver/splunkenterprisereceiver/client_test.go +++ b/receiver/splunkenterprisereceiver/client_test.go @@ -18,7 +18,7 @@ import ( "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/extension/auth" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" ) // mockHost allows us to create a test host with a no op extension that can be used to satisfy the SDK without having to parse from an diff --git a/receiver/splunkenterprisereceiver/config.go b/receiver/splunkenterprisereceiver/config.go index 077734fc06ba..a45b0b37f870 100644 --- a/receiver/splunkenterprisereceiver/config.go +++ b/receiver/splunkenterprisereceiver/config.go @@ -9,7 +9,7 @@ import ( "strings" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkenterprisereceiver/internal/metadata" diff --git a/receiver/splunkenterprisereceiver/factory.go b/receiver/splunkenterprisereceiver/factory.go index 70c12a7ed845..0fef8e048241 100644 --- a/receiver/splunkenterprisereceiver/factory.go +++ b/receiver/splunkenterprisereceiver/factory.go @@ -12,8 +12,8 @@ import ( "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkenterprisereceiver/internal/metadata" ) diff --git a/receiver/splunkenterprisereceiver/factory_test.go b/receiver/splunkenterprisereceiver/factory_test.go index cccc2a3bc61f..8a185e6f31db 100644 --- a/receiver/splunkenterprisereceiver/factory_test.go +++ b/receiver/splunkenterprisereceiver/factory_test.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkenterprisereceiver/internal/metadata" ) diff --git a/receiver/splunkenterprisereceiver/go.mod b/receiver/splunkenterprisereceiver/go.mod index c8281cb8f9d4..b0def99b8d17 100644 --- a/receiver/splunkenterprisereceiver/go.mod +++ b/receiver/splunkenterprisereceiver/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -59,7 +60,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect diff --git a/receiver/splunkenterprisereceiver/scraper_test.go b/receiver/splunkenterprisereceiver/scraper_test.go index 0af346d429e2..594a2ac4ed7b 100644 --- a/receiver/splunkenterprisereceiver/scraper_test.go +++ b/receiver/splunkenterprisereceiver/scraper_test.go @@ -18,7 +18,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/extension/auth" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest/pmetrictest" diff --git a/receiver/sqlqueryreceiver/config.go b/receiver/sqlqueryreceiver/config.go index 6928ed4c7753..fb586dce640e 100644 --- a/receiver/sqlqueryreceiver/config.go +++ b/receiver/sqlqueryreceiver/config.go @@ -7,7 +7,7 @@ import ( "time" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery" ) diff --git a/receiver/sqlqueryreceiver/config_test.go b/receiver/sqlqueryreceiver/config_test.go index 50ea2d7ee91a..374fb808b3fc 100644 --- a/receiver/sqlqueryreceiver/config_test.go +++ b/receiver/sqlqueryreceiver/config_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlqueryreceiver/internal/metadata" diff --git a/receiver/sqlqueryreceiver/go.mod b/receiver/sqlqueryreceiver/go.mod index 08e1c3c92036..cea4e55df973 100644 --- a/receiver/sqlqueryreceiver/go.mod +++ b/receiver/sqlqueryreceiver/go.mod @@ -27,8 +27,9 @@ require ( require ( go.opentelemetry.io/collector/component/componenttest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/consumer/consumertest v0.116.1-0.20250107062214-ced38e8af2ae - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/extension/xextension v0.116.0 go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 ) require ( @@ -143,13 +144,11 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/consumer/consumererror v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect diff --git a/receiver/sqlqueryreceiver/go.sum b/receiver/sqlqueryreceiver/go.sum index 54f97b36efec..fdd1671514e1 100644 --- a/receiver/sqlqueryreceiver/go.sum +++ b/receiver/sqlqueryreceiver/go.sum @@ -310,8 +310,6 @@ go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38 go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:dQnuZArB6AiD5p1zevGYrvn0KQFQ8WX/i5cffUdCrqA= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae h1:E6kmL+xRU8sV3Rouqxei+384CV+TlT6xHRKL+34orgo= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:wracOKvOenWibBm9XsObVGfZ0xp8ztogs731mE5iTrQ= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae h1:fGOr5NjORpu/jxjb0jkm/AdVhW1kbHtnqPa5Okl6RYk= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae/go.mod h1:yK3OycYduuhbbHaZ4cpolf6RZmkDv1kQHN+R7XEBKAI= go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae h1:vFpfVkM2ZqnFPMkZqwra9bMYbMCdHqrvrYV2s4c6bZ8= diff --git a/receiver/sqlqueryreceiver/logs_receiver.go b/receiver/sqlqueryreceiver/logs_receiver.go index c090f963a646..8ad575f488ed 100644 --- a/receiver/sqlqueryreceiver/logs_receiver.go +++ b/receiver/sqlqueryreceiver/logs_receiver.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/extension/experimental/storage" + "go.opentelemetry.io/collector/extension/xextension/storage" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/receiver" diff --git a/receiver/sqlqueryreceiver/receiver.go b/receiver/sqlqueryreceiver/receiver.go index 23508680a54a..846a3a2c64bc 100644 --- a/receiver/sqlqueryreceiver/receiver.go +++ b/receiver/sqlqueryreceiver/receiver.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlqueryreceiver/internal/metadata" diff --git a/receiver/sqlqueryreceiver/receiver_test.go b/receiver/sqlqueryreceiver/receiver_test.go index 42e568de5f94..0422cb63216d 100644 --- a/receiver/sqlqueryreceiver/receiver_test.go +++ b/receiver/sqlqueryreceiver/receiver_test.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery" diff --git a/receiver/sqlserverreceiver/config.go b/receiver/sqlserverreceiver/config.go index d44dc4a4a64b..417bf317ed09 100644 --- a/receiver/sqlserverreceiver/config.go +++ b/receiver/sqlserverreceiver/config.go @@ -7,7 +7,7 @@ import ( "errors" "go.opentelemetry.io/collector/config/configopaque" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver/internal/metadata" ) diff --git a/receiver/sqlserverreceiver/config_others_test.go b/receiver/sqlserverreceiver/config_others_test.go index 55988498bad5..41516b303ea6 100644 --- a/receiver/sqlserverreceiver/config_others_test.go +++ b/receiver/sqlserverreceiver/config_others_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver/internal/metadata" ) diff --git a/receiver/sqlserverreceiver/config_test.go b/receiver/sqlserverreceiver/config_test.go index 28cff062fe89..eb0fd7726d03 100644 --- a/receiver/sqlserverreceiver/config_test.go +++ b/receiver/sqlserverreceiver/config_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver/internal/metadata" ) diff --git a/receiver/sqlserverreceiver/config_windows_test.go b/receiver/sqlserverreceiver/config_windows_test.go index d0889c446dba..3beed9fae8f7 100644 --- a/receiver/sqlserverreceiver/config_windows_test.go +++ b/receiver/sqlserverreceiver/config_windows_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver/internal/metadata" ) diff --git a/receiver/sqlserverreceiver/factory.go b/receiver/sqlserverreceiver/factory.go index 2613c875a0cd..1858772c6870 100644 --- a/receiver/sqlserverreceiver/factory.go +++ b/receiver/sqlserverreceiver/factory.go @@ -11,8 +11,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver/internal/metadata" diff --git a/receiver/sqlserverreceiver/factory_others.go b/receiver/sqlserverreceiver/factory_others.go index 00da83f71a6d..65a201fcb8c5 100644 --- a/receiver/sqlserverreceiver/factory_others.go +++ b/receiver/sqlserverreceiver/factory_others.go @@ -11,7 +11,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" ) // createMetricsReceiver creates a metrics receiver based on provided config. diff --git a/receiver/sqlserverreceiver/factory_test.go b/receiver/sqlserverreceiver/factory_test.go index 2682d342ccf8..b9d53cc90f98 100644 --- a/receiver/sqlserverreceiver/factory_test.go +++ b/receiver/sqlserverreceiver/factory_test.go @@ -13,7 +13,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver/internal/metadata" ) diff --git a/receiver/sqlserverreceiver/factory_windows.go b/receiver/sqlserverreceiver/factory_windows.go index c8bff7fc6e61..790ed79f7fe5 100644 --- a/receiver/sqlserverreceiver/factory_windows.go +++ b/receiver/sqlserverreceiver/factory_windows.go @@ -11,8 +11,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver/internal/metadata" ) diff --git a/receiver/sqlserverreceiver/go.mod b/receiver/sqlserverreceiver/go.mod index 33b10f01bf42..90e3009b63f8 100644 --- a/receiver/sqlserverreceiver/go.mod +++ b/receiver/sqlserverreceiver/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -103,7 +104,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect go.opentelemetry.io/otel/sdk v1.32.0 // indirect diff --git a/receiver/sqlserverreceiver/scraper.go b/receiver/sqlserverreceiver/scraper.go index c00b34316a51..9b43f4b5d37e 100644 --- a/receiver/sqlserverreceiver/scraper.go +++ b/receiver/sqlserverreceiver/scraper.go @@ -14,8 +14,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery" diff --git a/receiver/sshcheckreceiver/config.go b/receiver/sshcheckreceiver/config.go index cdc5e51e80e3..f75136ee495e 100644 --- a/receiver/sshcheckreceiver/config.go +++ b/receiver/sshcheckreceiver/config.go @@ -8,7 +8,7 @@ import ( "net" "strings" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sshcheckreceiver/internal/configssh" diff --git a/receiver/sshcheckreceiver/config_test.go b/receiver/sshcheckreceiver/config_test.go index fdaf556cd9a8..87dd31d3716f 100644 --- a/receiver/sshcheckreceiver/config_test.go +++ b/receiver/sshcheckreceiver/config_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sshcheckreceiver/internal/configssh" diff --git a/receiver/sshcheckreceiver/factory.go b/receiver/sshcheckreceiver/factory.go index a99164d42e62..d5f0b174cdb9 100644 --- a/receiver/sshcheckreceiver/factory.go +++ b/receiver/sshcheckreceiver/factory.go @@ -10,8 +10,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sshcheckreceiver/internal/configssh" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sshcheckreceiver/internal/metadata" diff --git a/receiver/sshcheckreceiver/factory_test.go b/receiver/sshcheckreceiver/factory_test.go index 8455b4db7f21..d36171e2088b 100644 --- a/receiver/sshcheckreceiver/factory_test.go +++ b/receiver/sshcheckreceiver/factory_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sshcheckreceiver/internal/configssh" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sshcheckreceiver/internal/metadata" diff --git a/receiver/sshcheckreceiver/go.mod b/receiver/sshcheckreceiver/go.mod index c470dbbad908..e6789c145e4e 100644 --- a/receiver/sshcheckreceiver/go.mod +++ b/receiver/sshcheckreceiver/go.mod @@ -20,6 +20,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 golang.org/x/crypto v0.31.0 @@ -47,7 +48,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/otel/sdk v1.32.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect ) diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index 5390234be52f..377f3b5dacc8 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -57,7 +57,6 @@ require ( go.opentelemetry.io/collector/consumer/consumererror v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index 04a3978a5251..caf0d81ca8af 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -99,8 +99,6 @@ go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38 go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:dQnuZArB6AiD5p1zevGYrvn0KQFQ8WX/i5cffUdCrqA= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae h1:E6kmL+xRU8sV3Rouqxei+384CV+TlT6xHRKL+34orgo= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:wracOKvOenWibBm9XsObVGfZ0xp8ztogs731mE5iTrQ= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae h1:fGOr5NjORpu/jxjb0jkm/AdVhW1kbHtnqPa5Okl6RYk= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae/go.mod h1:yK3OycYduuhbbHaZ4cpolf6RZmkDv1kQHN+R7XEBKAI= go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae h1:vFpfVkM2ZqnFPMkZqwra9bMYbMCdHqrvrYV2s4c6bZ8= diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index 5c695374502f..bae96b35a158 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -56,7 +56,6 @@ require ( go.opentelemetry.io/collector/consumer/consumererror v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pdata v1.22.1-0.20250107062214-ced38e8af2ae // indirect diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index 04a3978a5251..caf0d81ca8af 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -99,8 +99,6 @@ go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38 go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:dQnuZArB6AiD5p1zevGYrvn0KQFQ8WX/i5cffUdCrqA= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae h1:E6kmL+xRU8sV3Rouqxei+384CV+TlT6xHRKL+34orgo= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:wracOKvOenWibBm9XsObVGfZ0xp8ztogs731mE5iTrQ= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae h1:fGOr5NjORpu/jxjb0jkm/AdVhW1kbHtnqPa5Okl6RYk= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae/go.mod h1:yK3OycYduuhbbHaZ4cpolf6RZmkDv1kQHN+R7XEBKAI= go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae h1:vFpfVkM2ZqnFPMkZqwra9bMYbMCdHqrvrYV2s4c6bZ8= diff --git a/receiver/tlscheckreceiver/config.go b/receiver/tlscheckreceiver/config.go index d20c7b2e091d..55fc395362a8 100644 --- a/receiver/tlscheckreceiver/config.go +++ b/receiver/tlscheckreceiver/config.go @@ -8,7 +8,7 @@ import ( "fmt" "net/url" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tlscheckreceiver/internal/metadata" diff --git a/receiver/tlscheckreceiver/config_test.go b/receiver/tlscheckreceiver/config_test.go index 2aa2c47cd4bc..4f0a9b46c06f 100644 --- a/receiver/tlscheckreceiver/config_test.go +++ b/receiver/tlscheckreceiver/config_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" ) func TestValidate(t *testing.T) { diff --git a/receiver/tlscheckreceiver/factory.go b/receiver/tlscheckreceiver/factory.go index de3e0fcaa265..0e3d7a570336 100644 --- a/receiver/tlscheckreceiver/factory.go +++ b/receiver/tlscheckreceiver/factory.go @@ -10,8 +10,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tlscheckreceiver/internal/metadata" ) diff --git a/receiver/tlscheckreceiver/factory_test.go b/receiver/tlscheckreceiver/factory_test.go index 2ca0e3d0ff0c..916bc955ddfa 100644 --- a/receiver/tlscheckreceiver/factory_test.go +++ b/receiver/tlscheckreceiver/factory_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tlscheckreceiver/internal/metadata" ) diff --git a/receiver/tlscheckreceiver/go.mod b/receiver/tlscheckreceiver/go.mod index 418ef539cfb7..b813e7561edf 100644 --- a/receiver/tlscheckreceiver/go.mod +++ b/receiver/tlscheckreceiver/go.mod @@ -15,6 +15,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -43,7 +44,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect go.opentelemetry.io/otel/sdk v1.32.0 // indirect diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index 2ef2e0bb6534..efd9dc2ea4e1 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -52,7 +52,6 @@ require ( go.opentelemetry.io/collector/consumer/consumererror v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pdata v1.22.1-0.20250107062214-ced38e8af2ae // indirect diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index 0c70105b4c55..dd1f9032fb0a 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -91,8 +91,6 @@ go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38 go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:dQnuZArB6AiD5p1zevGYrvn0KQFQ8WX/i5cffUdCrqA= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae h1:E6kmL+xRU8sV3Rouqxei+384CV+TlT6xHRKL+34orgo= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:wracOKvOenWibBm9XsObVGfZ0xp8ztogs731mE5iTrQ= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae h1:fGOr5NjORpu/jxjb0jkm/AdVhW1kbHtnqPa5Okl6RYk= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae/go.mod h1:yK3OycYduuhbbHaZ4cpolf6RZmkDv1kQHN+R7XEBKAI= go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae h1:vFpfVkM2ZqnFPMkZqwra9bMYbMCdHqrvrYV2s4c6bZ8= diff --git a/receiver/vcenterreceiver/config.go b/receiver/vcenterreceiver/config.go index 938638e30464..529cfcec2298 100644 --- a/receiver/vcenterreceiver/config.go +++ b/receiver/vcenterreceiver/config.go @@ -11,7 +11,7 @@ import ( "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configtls" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver/internal/metadata" diff --git a/receiver/vcenterreceiver/config_test.go b/receiver/vcenterreceiver/config_test.go index 1d714f4f2348..1dd5e8aa2fe6 100644 --- a/receiver/vcenterreceiver/config_test.go +++ b/receiver/vcenterreceiver/config_test.go @@ -15,7 +15,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver/internal/metadata" ) diff --git a/receiver/vcenterreceiver/factory.go b/receiver/vcenterreceiver/factory.go index 5bdf539d22f7..c6839d74a791 100644 --- a/receiver/vcenterreceiver/factory.go +++ b/receiver/vcenterreceiver/factory.go @@ -12,8 +12,8 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver/internal/metadata" ) diff --git a/receiver/vcenterreceiver/go.mod b/receiver/vcenterreceiver/go.mod index 62532082067f..e569a4df089b 100644 --- a/receiver/vcenterreceiver/go.mod +++ b/receiver/vcenterreceiver/go.mod @@ -23,6 +23,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -90,7 +91,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect diff --git a/receiver/windowseventlogreceiver/go.mod b/receiver/windowseventlogreceiver/go.mod index 316fd6da09e1..9e503a9bea1c 100644 --- a/receiver/windowseventlogreceiver/go.mod +++ b/receiver/windowseventlogreceiver/go.mod @@ -55,7 +55,6 @@ require ( go.opentelemetry.io/collector/consumer/consumererror v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect diff --git a/receiver/windowseventlogreceiver/go.sum b/receiver/windowseventlogreceiver/go.sum index 0c70105b4c55..dd1f9032fb0a 100644 --- a/receiver/windowseventlogreceiver/go.sum +++ b/receiver/windowseventlogreceiver/go.sum @@ -91,8 +91,6 @@ go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38 go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:dQnuZArB6AiD5p1zevGYrvn0KQFQ8WX/i5cffUdCrqA= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae h1:E6kmL+xRU8sV3Rouqxei+384CV+TlT6xHRKL+34orgo= go.opentelemetry.io/collector/extension v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:wracOKvOenWibBm9XsObVGfZ0xp8ztogs731mE5iTrQ= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae h1:fGOr5NjORpu/jxjb0jkm/AdVhW1kbHtnqPa5Okl6RYk= go.opentelemetry.io/collector/extension/xextension v0.0.0-20250107062214-ced38e8af2ae/go.mod h1:yK3OycYduuhbbHaZ4cpolf6RZmkDv1kQHN+R7XEBKAI= go.opentelemetry.io/collector/featuregate v1.22.1-0.20250107062214-ced38e8af2ae h1:vFpfVkM2ZqnFPMkZqwra9bMYbMCdHqrvrYV2s4c6bZ8= diff --git a/receiver/windowsperfcountersreceiver/config.go b/receiver/windowsperfcountersreceiver/config.go index 37c8648d8680..1c238d71b2a3 100644 --- a/receiver/windowsperfcountersreceiver/config.go +++ b/receiver/windowsperfcountersreceiver/config.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" ) diff --git a/receiver/windowsperfcountersreceiver/config_test.go b/receiver/windowsperfcountersreceiver/config_test.go index 22d89d091ad7..536e5ebe8c0f 100644 --- a/receiver/windowsperfcountersreceiver/config_test.go +++ b/receiver/windowsperfcountersreceiver/config_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver/internal/metadata" ) diff --git a/receiver/windowsperfcountersreceiver/factory.go b/receiver/windowsperfcountersreceiver/factory.go index 125e49c41bf4..eca299ed9e39 100644 --- a/receiver/windowsperfcountersreceiver/factory.go +++ b/receiver/windowsperfcountersreceiver/factory.go @@ -6,7 +6,7 @@ package windowsperfcountersreceiver // import "github.com/open-telemetry/opentel import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver/internal/metadata" ) diff --git a/receiver/windowsperfcountersreceiver/factory_windows.go b/receiver/windowsperfcountersreceiver/factory_windows.go index 88f81427e58b..2d69559a3b57 100644 --- a/receiver/windowsperfcountersreceiver/factory_windows.go +++ b/receiver/windowsperfcountersreceiver/factory_windows.go @@ -11,8 +11,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver/internal/metadata" ) diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index fe8a74852c82..8de22677faa4 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -17,6 +17,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -46,7 +47,6 @@ require ( go.opentelemetry.io/collector/consumer/xconsumer v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/metric v1.32.0 // indirect go.opentelemetry.io/otel/sdk v1.32.0 // indirect diff --git a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go index ac66b97f89e0..9d7239d269d1 100644 --- a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go +++ b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go @@ -18,8 +18,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper/scrapererror" + "go.opentelemetry.io/collector/scraper/scraperhelper" "go.uber.org/multierr" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/receiver/zookeeperreceiver/config.go b/receiver/zookeeperreceiver/config.go index 65776fa6eb72..873484aac48c 100644 --- a/receiver/zookeeperreceiver/config.go +++ b/receiver/zookeeperreceiver/config.go @@ -5,7 +5,7 @@ package zookeeperreceiver // import "github.com/open-telemetry/opentelemetry-col import ( "go.opentelemetry.io/collector/config/confignet" - "go.opentelemetry.io/collector/receiver/scraperhelper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver/internal/metadata" ) diff --git a/receiver/zookeeperreceiver/factory.go b/receiver/zookeeperreceiver/factory.go index e424ff5f9c89..57cdbf82276a 100644 --- a/receiver/zookeeperreceiver/factory.go +++ b/receiver/zookeeperreceiver/factory.go @@ -11,8 +11,8 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.opentelemetry.io/collector/scraper" + "go.opentelemetry.io/collector/scraper/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver/internal/metadata" diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index 618cb59d4d28..5066d4ec003f 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -21,6 +21,7 @@ require ( go.opentelemetry.io/collector/receiver v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/receiver/receivertest v0.116.1-0.20250107062214-ced38e8af2ae go.opentelemetry.io/collector/scraper v0.116.1-0.20250107062214-ced38e8af2ae + go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -85,7 +86,6 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/pipeline v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/scraper/scraperhelper v0.116.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect go.opentelemetry.io/otel v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect diff --git a/testbed/go.mod b/testbed/go.mod index ea604f684092..5b660ba17180 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -275,7 +275,6 @@ require ( go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/exporter/xexporter v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/auth v0.116.1-0.20250107062214-ced38e8af2ae // indirect - go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae // indirect go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect diff --git a/testbed/go.sum b/testbed/go.sum index 1d3c2a32f686..7bde4c8ed7a8 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -817,8 +817,6 @@ go.opentelemetry.io/collector/extension/auth v0.116.1-0.20250107062214-ced38e8af go.opentelemetry.io/collector/extension/auth v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:G4hZQ8YcFZG0CdPNKgFsbVxccg1HxpPIOj1dp3kiqK0= go.opentelemetry.io/collector/extension/auth/authtest v0.116.0 h1:KcMvjb4R0wpkmmi7EOk7zT5sgl7uwXY/VQfMEUVYcLM= go.opentelemetry.io/collector/extension/auth/authtest v0.116.0/go.mod h1:zyWTdh+CUKh7BbszTWUWp806NA6EDyix77O4Q6XaOA8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae h1:qecZX427MpaBor8CERgp8mCkgwiCbeCwwAKX8RWJfb8= -go.opentelemetry.io/collector/extension/experimental/storage v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:528SliCQHkZsTQHMFwE04prZpSfem5fV0e1d1Fcg5ek= go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae h1:yNz7znsH5axFPdx3s5hcNOW8zeSDFuQdLFq7QsV4P9g= go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.1-0.20250107062214-ced38e8af2ae/go.mod h1:W2NO5doyflSwrakLAXA497yn2XtvdUYGJqDppcg6oXY= go.opentelemetry.io/collector/extension/extensiontest v0.116.1-0.20250107062214-ced38e8af2ae h1:CcLb5enUjIXSwi2CWpVULD9nA6TtmxnxVEF1cOUL2gE=