diff --git a/internal/tools/go.mod b/internal/tools/go.mod index ee60cac871117..3056048dad7c1 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -8,6 +8,7 @@ require ( github.com/google/addlicense v0.0.0-20200906110928-a0294312aa76 github.com/google/go-cmp v0.5.6 // indirect github.com/jstemmer/go-junit-report v0.9.1 + github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen v0.0.0-00010101000000-000000000000 github.com/pavius/impi v0.0.3 github.com/prometheus/common v0.29.0 // indirect github.com/spf13/cobra v1.2.1 // indirect @@ -15,7 +16,6 @@ require ( github.com/tcnksm/ghr v0.14.0 go.opentelemetry.io/build-tools/checkdoc v0.0.0-20210826185254-a20c5b1e2d7c go.opentelemetry.io/build-tools/issuegenerator v0.0.0-20210826185254-a20c5b1e2d7c - github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen v0.0.0-00010101000000-000000000000 go.uber.org/atomic v1.8.0 // indirect golang.org/x/tools v0.1.3 google.golang.org/protobuf v1.27.1 // indirect diff --git a/internal/tools/go.sum b/internal/tools/go.sum index 8a923a92115a7..0394c468b14f6 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -773,8 +773,6 @@ go.opentelemetry.io/build-tools/checkdoc v0.0.0-20210826185254-a20c5b1e2d7c h1:P go.opentelemetry.io/build-tools/checkdoc v0.0.0-20210826185254-a20c5b1e2d7c/go.mod h1:LSxCgynkoVzMPV/OEMaGXWm48o0WVAXocdfpvmJX1pE= go.opentelemetry.io/build-tools/issuegenerator v0.0.0-20210826185254-a20c5b1e2d7c h1:JW6d8hV1v8azYP9SAjA3Yh0uqLDBjYHz2VcvI+TPHLw= go.opentelemetry.io/build-tools/issuegenerator v0.0.0-20210826185254-a20c5b1e2d7c/go.mod h1:NSrnkWJbEC6r27HIE2fnIpQ/ttCgXEaIyVGzOGE8nqs= -go.opentelemetry.io/collector/cmd/mdatagen v0.33.1-0.20210826200354-479f46434f9a h1:mD0StQ09YNxS5WNJG0ynD4asWcPcJLwMdvKVUX0DlL8= -go.opentelemetry.io/collector/cmd/mdatagen v0.33.1-0.20210826200354-479f46434f9a/go.mod h1:ORcm4LeOEv8/3Y+g05+LSfZIaD50XAjSpqek5PcQKrs= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/dotnetdiagnosticsreceiver/config.go b/receiver/dotnetdiagnosticsreceiver/config.go index 4dc13595cf48a..29fd4e109c9e8 100644 --- a/receiver/dotnetdiagnosticsreceiver/config.go +++ b/receiver/dotnetdiagnosticsreceiver/config.go @@ -15,7 +15,7 @@ package dotnetdiagnosticsreceiver import ( - "go.opentelemetry.io/collector/receiver/scraperhelper" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) type Config struct { diff --git a/receiver/dotnetdiagnosticsreceiver/factory.go b/receiver/dotnetdiagnosticsreceiver/factory.go index 3f4e91b43bed0..e6cf1537f56fb 100644 --- a/receiver/dotnetdiagnosticsreceiver/factory.go +++ b/receiver/dotnetdiagnosticsreceiver/factory.go @@ -26,7 +26,8 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" - "go.opentelemetry.io/collector/receiver/scraperhelper" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver/network" ) diff --git a/receiver/dotnetdiagnosticsreceiver/go.mod b/receiver/dotnetdiagnosticsreceiver/go.mod index 0407b1d171f1e..e627c739e3b91 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.mod +++ b/receiver/dotnetdiagnosticsreceiver/go.mod @@ -3,8 +3,13 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnet go 1.16 require ( + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 go.opentelemetry.io/collector v0.33.1-0.20210826200354-479f46434f9a go.opentelemetry.io/collector/model v0.33.1-0.20210826200354-479f46434f9a go.uber.org/zap v1.19.0 ) + +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ../scraperhelper + +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scrapererror => ../scrapererror diff --git a/receiver/kafkametricsreceiver/broker_scraper.go b/receiver/kafkametricsreceiver/broker_scraper.go index 297fa32256001..c3643f69226a2 100644 --- a/receiver/kafkametricsreceiver/broker_scraper.go +++ b/receiver/kafkametricsreceiver/broker_scraper.go @@ -23,9 +23,10 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/model/pdata" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver/internal/metadata" ) diff --git a/receiver/kafkametricsreceiver/config.go b/receiver/kafkametricsreceiver/config.go index 0e92ce5869ae7..1b576af3ab74d 100644 --- a/receiver/kafkametricsreceiver/config.go +++ b/receiver/kafkametricsreceiver/config.go @@ -15,9 +15,8 @@ package kafkametricsreceiver import ( - "go.opentelemetry.io/collector/receiver/scraperhelper" - "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) // Config represents user settings for kafkametrics receiver diff --git a/receiver/kafkametricsreceiver/config_test.go b/receiver/kafkametricsreceiver/config_test.go index 76f23bfca4566..8ca8afca3076d 100644 --- a/receiver/kafkametricsreceiver/config_test.go +++ b/receiver/kafkametricsreceiver/config_test.go @@ -24,9 +24,9 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/config/configtls" - "go.opentelemetry.io/collector/receiver/scraperhelper" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) func TestLoadConfig(t *testing.T) { diff --git a/receiver/kafkametricsreceiver/consumer_scraper.go b/receiver/kafkametricsreceiver/consumer_scraper.go index c2d775c08d4ca..96c5cdee0177b 100644 --- a/receiver/kafkametricsreceiver/consumer_scraper.go +++ b/receiver/kafkametricsreceiver/consumer_scraper.go @@ -24,10 +24,11 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/model/pdata" - "go.opentelemetry.io/collector/receiver/scrapererror" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scrapererror" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver/internal/metadata" ) diff --git a/receiver/kafkametricsreceiver/factory.go b/receiver/kafkametricsreceiver/factory.go index d6c1962efb983..9807927cd333a 100644 --- a/receiver/kafkametricsreceiver/factory.go +++ b/receiver/kafkametricsreceiver/factory.go @@ -21,7 +21,8 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" - "go.opentelemetry.io/collector/receiver/scraperhelper" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) const ( diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index dc47cd5181847..6bee4e8bbd772 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -6,6 +6,8 @@ require ( github.com/Shopify/sarama v1.29.1 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scrapererror v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 go.opentelemetry.io/collector v0.33.1-0.20210826200354-479f46434f9a go.opentelemetry.io/collector/model v0.33.1-0.20210826200354-479f46434f9a @@ -19,3 +21,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/commo replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger => ./../../pkg/translator/jaeger + +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ../scraperhelper + +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scrapererror => ../scrapererror diff --git a/receiver/kafkametricsreceiver/receiver.go b/receiver/kafkametricsreceiver/receiver.go index 368a2acaff1fa..fc3fde6073ac5 100644 --- a/receiver/kafkametricsreceiver/receiver.go +++ b/receiver/kafkametricsreceiver/receiver.go @@ -21,9 +21,10 @@ import ( "github.com/Shopify/sarama" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" ) diff --git a/receiver/kafkametricsreceiver/receiver_test.go b/receiver/kafkametricsreceiver/receiver_test.go index a117c08335d7c..5078dbf2608ea 100644 --- a/receiver/kafkametricsreceiver/receiver_test.go +++ b/receiver/kafkametricsreceiver/receiver_test.go @@ -24,9 +24,10 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter" ) diff --git a/receiver/kafkametricsreceiver/topic_scraper.go b/receiver/kafkametricsreceiver/topic_scraper.go index a25145feb0403..7692e9ad80173 100644 --- a/receiver/kafkametricsreceiver/topic_scraper.go +++ b/receiver/kafkametricsreceiver/topic_scraper.go @@ -24,10 +24,11 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/model/pdata" - "go.opentelemetry.io/collector/receiver/scrapererror" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scrapererror" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver/internal/metadata" ) diff --git a/receiver/memcachedreceiver/config.go b/receiver/memcachedreceiver/config.go index 23616666cec88..adcd97cfb0fb1 100644 --- a/receiver/memcachedreceiver/config.go +++ b/receiver/memcachedreceiver/config.go @@ -18,7 +18,8 @@ import ( "time" "go.opentelemetry.io/collector/config/confignet" - "go.opentelemetry.io/collector/receiver/scraperhelper" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) type Config struct { diff --git a/receiver/memcachedreceiver/factory.go b/receiver/memcachedreceiver/factory.go index fb38ed5fc0346..b865bb659bcd6 100644 --- a/receiver/memcachedreceiver/factory.go +++ b/receiver/memcachedreceiver/factory.go @@ -25,7 +25,8 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" - "go.opentelemetry.io/collector/receiver/scraperhelper" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) const ( diff --git a/receiver/memcachedreceiver/factory_test.go b/receiver/memcachedreceiver/factory_test.go index 423b3dd40c3c3..d84a99cfbacf9 100644 --- a/receiver/memcachedreceiver/factory_test.go +++ b/receiver/memcachedreceiver/factory_test.go @@ -23,7 +23,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) func TestType(t *testing.T) { diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index 01416660e6d59..918cc9676f26b 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -5,10 +5,16 @@ go 1.16 require ( github.com/grobie/gomemcache v0.0.0-20180201122607-1f779c573665 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 go.opentelemetry.io/collector v0.33.1-0.20210826200354-479f46434f9a go.opentelemetry.io/collector/model v0.33.1-0.20210826200354-479f46434f9a go.uber.org/zap v1.19.0 + ) replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common + +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ../scraperhelper + +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scrapererror => ../scrapererror diff --git a/receiver/memcachedreceiver/scraper.go b/receiver/memcachedreceiver/scraper.go index 18d5ff9c179e4..28ba4d0d9da5d 100644 --- a/receiver/memcachedreceiver/scraper.go +++ b/receiver/memcachedreceiver/scraper.go @@ -20,9 +20,10 @@ import ( "github.com/grobie/gomemcache/memcache" "go.opentelemetry.io/collector/model/pdata" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/memcachedreceiver/internal/metadata" ) diff --git a/receiver/nginxreceiver/config.go b/receiver/nginxreceiver/config.go index 43f8b2ef3d8f5..fe7194272715c 100644 --- a/receiver/nginxreceiver/config.go +++ b/receiver/nginxreceiver/config.go @@ -16,7 +16,8 @@ package nginxreceiver import ( "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/receiver/scraperhelper" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) type Config struct { diff --git a/receiver/nginxreceiver/factory.go b/receiver/nginxreceiver/factory.go index 00d398f56f913..1d260475ba23f 100644 --- a/receiver/nginxreceiver/factory.go +++ b/receiver/nginxreceiver/factory.go @@ -25,7 +25,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" - "go.opentelemetry.io/collector/receiver/scraperhelper" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) const ( diff --git a/receiver/nginxreceiver/factory_test.go b/receiver/nginxreceiver/factory_test.go index 54ef78af9dde4..b55ae720e54eb 100644 --- a/receiver/nginxreceiver/factory_test.go +++ b/receiver/nginxreceiver/factory_test.go @@ -23,7 +23,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configcheck" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) func TestType(t *testing.T) { diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 4d02776e89f23..0a637b578279d 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -4,6 +4,7 @@ go 1.16 require ( github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201110005315-f5a5f8086c19 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.0.0-00010101000000-000000000000 github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/testify v1.7.0 github.com/testcontainers/testcontainers-go v0.11.1 @@ -12,3 +13,7 @@ require ( go.uber.org/zap v1.19.0 golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect ) + +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ../scraperhelper + +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scrapererror => ../scrapererror diff --git a/receiver/nginxreceiver/integration_test.go b/receiver/nginxreceiver/integration_test.go index c1ae87aa92caa..83824026c512c 100644 --- a/receiver/nginxreceiver/integration_test.go +++ b/receiver/nginxreceiver/integration_test.go @@ -29,9 +29,10 @@ import ( "github.com/testcontainers/testcontainers-go/wait" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver/internal/metadata" ) diff --git a/receiver/podmanreceiver/config.go b/receiver/podmanreceiver/config.go index 46d23fa7508a6..f79f7ae760adc 100644 --- a/receiver/podmanreceiver/config.go +++ b/receiver/podmanreceiver/config.go @@ -18,7 +18,8 @@ import ( "errors" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/receiver/scraperhelper" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) var _ config.Receiver = (*Config)(nil) diff --git a/receiver/podmanreceiver/factory.go b/receiver/podmanreceiver/factory.go index 1eba2908e7017..fa58f6d6c1c4f 100644 --- a/receiver/podmanreceiver/factory.go +++ b/receiver/podmanreceiver/factory.go @@ -22,7 +22,8 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" - "go.opentelemetry.io/collector/receiver/scraperhelper" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) const ( diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index 6d9de630024f5..41a90303189ea 100644 --- a/receiver/podmanreceiver/go.mod +++ b/receiver/podmanreceiver/go.mod @@ -3,10 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podman go 1.16 require ( + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 go.opentelemetry.io/collector v0.33.1-0.20210826200354-479f46434f9a - go.opentelemetry.io/collector/model v0.33.1-0.20210826200354-479f46434f9a // indirect go.uber.org/zap v1.19.0 ) replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common + +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ../scraperhelper + +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scrapererror => ../scrapererror diff --git a/receiver/podmanreceiver/receiver_test.go b/receiver/podmanreceiver/receiver_test.go index 2550e7f9da080..62b3e92c53547 100644 --- a/receiver/podmanreceiver/receiver_test.go +++ b/receiver/podmanreceiver/receiver_test.go @@ -25,8 +25,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) func TestNewReceiver(t *testing.T) { diff --git a/receiver/windowsperfcountersreceiver/config.go b/receiver/windowsperfcountersreceiver/config.go index 1c8ffdea13066..bc51055cfd86f 100644 --- a/receiver/windowsperfcountersreceiver/config.go +++ b/receiver/windowsperfcountersreceiver/config.go @@ -18,7 +18,8 @@ import ( "fmt" "go.opentelemetry.io/collector/consumer/consumererror" - "go.opentelemetry.io/collector/receiver/scraperhelper" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) // Config defines configuration for WindowsPerfCounters receiver. diff --git a/receiver/windowsperfcountersreceiver/config_test.go b/receiver/windowsperfcountersreceiver/config_test.go index 976c320211da3..bf990692d8a2a 100644 --- a/receiver/windowsperfcountersreceiver/config_test.go +++ b/receiver/windowsperfcountersreceiver/config_test.go @@ -25,7 +25,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" - "go.opentelemetry.io/collector/receiver/scraperhelper" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) func TestLoadConfig(t *testing.T) { diff --git a/receiver/windowsperfcountersreceiver/factory.go b/receiver/windowsperfcountersreceiver/factory.go index 8984c1f2d5f66..0704cd5b54f09 100644 --- a/receiver/windowsperfcountersreceiver/factory.go +++ b/receiver/windowsperfcountersreceiver/factory.go @@ -20,7 +20,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/receiver/receiverhelper" - "go.opentelemetry.io/collector/receiver/scraperhelper" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) // This file implements Factory for WindowsPerfCounters receiver. diff --git a/receiver/windowsperfcountersreceiver/factory_windows.go b/receiver/windowsperfcountersreceiver/factory_windows.go index e335668b6d7fe..f992aebafef2e 100644 --- a/receiver/windowsperfcountersreceiver/factory_windows.go +++ b/receiver/windowsperfcountersreceiver/factory_windows.go @@ -22,7 +22,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/receiver/scraperhelper" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) // createMetricsReceiver creates a metrics receiver based on provided config. diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index 84ada08d5f80b..ae67c8396d9f3 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -3,9 +3,15 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/window go 1.16 require ( + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 go.opentelemetry.io/collector v0.33.1-0.20210826200354-479f46434f9a go.opentelemetry.io/collector/model v0.33.1-0.20210826200354-479f46434f9a go.uber.org/zap v1.19.0 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 + ) + +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ../scraperhelper + +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scrapererror => ../scrapererror diff --git a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go index 596a14fef77b4..9e0e64abd6267 100644 --- a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go +++ b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go @@ -25,11 +25,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/receiver/scraperhelper" "go.uber.org/zap" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver/internal/third_party/telegraf/win_perf_counters" ) diff --git a/receiver/zookeeperreceiver/config.go b/receiver/zookeeperreceiver/config.go index 8863a01525c66..31b586e7a9355 100644 --- a/receiver/zookeeperreceiver/config.go +++ b/receiver/zookeeperreceiver/config.go @@ -18,7 +18,8 @@ import ( "time" "go.opentelemetry.io/collector/config/confignet" - "go.opentelemetry.io/collector/receiver/scraperhelper" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) type Config struct { diff --git a/receiver/zookeeperreceiver/factory.go b/receiver/zookeeperreceiver/factory.go index 0533628e8482b..2091bf0cdb09c 100644 --- a/receiver/zookeeperreceiver/factory.go +++ b/receiver/zookeeperreceiver/factory.go @@ -23,7 +23,8 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/receiverhelper" - "go.opentelemetry.io/collector/receiver/scraperhelper" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper" ) const ( diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index 687f78dea10fb..f309d43b48e45 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -5,6 +5,7 @@ go 1.16 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 go.opentelemetry.io/collector v0.33.1-0.20210826200354-479f46434f9a go.opentelemetry.io/collector/model v0.33.1-0.20210826200354-479f46434f9a @@ -15,3 +16,7 @@ require ( replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal + +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper => ../scraperhelper + +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scrapererror => ../scrapererror