From a8fb43b24d4f2ae93ef008f4ca8c9f4a0630d90b Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Wed, 7 Dec 2022 21:10:04 -0800 Subject: [PATCH] [chore] Rename internal/scrapertest module to comparetest (#16802) There is need to compare other types (not metrics only) and in other places (not scrapers only). So the module should be renamed to something more generic for comparing pdata instances in tests. Other name suggestions are welcome --- .github/CODEOWNERS | 2 +- .github/ISSUE_TEMPLATE/bug_report.yaml | 2 +- .github/ISSUE_TEMPLATE/feature_request.yaml | 2 +- .github/ISSUE_TEMPLATE/other.yaml | 2 +- .github/dependabot.yml | 8 ++-- cmd/configschema/go.mod | 2 +- cmd/otelcontribcol/go.mod | 2 +- cmd/oteltestbedcol/go.mod | 2 +- exporter/datadogexporter/go.mod | 2 +- go.mod | 2 +- .../{scrapertest => comparetest}/Makefile | 0 .../{scrapertest => comparetest}/README.md | 6 +-- .../{scrapertest => comparetest}/compare.go | 2 +- .../compare_test.go | 4 +- internal/{scrapertest => comparetest}/go.mod | 2 +- internal/{scrapertest => comparetest}/go.sum | 0 .../golden/golden.go | 2 +- .../golden/golden_test.go | 0 .../golden/testdata/roundtrip/expected.json | 0 internal/{scrapertest => comparetest}/mask.go | 2 +- .../sort/attributes.go | 2 +- .../sort/attributes_test.go | 0 .../actual.json | 0 .../expected.json | 0 .../actual.json | 0 .../expected.json | 0 .../data-point-attribute-extra/actual.json | 0 .../data-point-attribute-extra/expected.json | 0 .../data-point-attribute-key/actual.json | 0 .../data-point-attribute-key/expected.json | 0 .../data-point-attribute-missing/actual.json | 0 .../expected.json | 0 .../data-point-attribute-value/actual.json | 0 .../data-point-attribute-value/expected.json | 0 .../actual.json | 0 .../expected.json | 0 .../actual.json | 0 .../expected.json | 0 .../data-point-slice-dedup/actual.json | 0 .../data-point-slice-dedup/expected.json | 0 .../data-point-slice-extra/actual.json | 0 .../data-point-slice-extra/expected.json | 0 .../data-point-slice-missing/actual.json | 0 .../data-point-slice-missing/expected.json | 0 .../actual.json | 0 .../expected.json | 0 .../actual.json | 0 .../expected.json | 0 .../data-point-value-expect-int/actual.json | 0 .../data-point-value-expect-int/expected.json | 0 .../data-point-value-int-mismatch/actual.json | 0 .../expected.json | 0 .../testdata/equal/actual.json | 0 .../testdata/equal/expected.json | 0 .../actual.json | 0 .../expected.json | 0 .../actual.json | 0 .../expected.json | 0 .../actual.json | 0 .../expected.json | 0 .../actual.json | 0 .../expected.json | 0 .../ignore-each-attribute-value/actual.json | 0 .../ignore-each-attribute-value/expected.json | 0 .../ignore-global-attribute-value/actual.json | 0 .../expected.json | 0 .../ignore-one-attribute-value/actual.json | 0 .../ignore-one-attribute-value/expected.json | 0 .../actual.json | 0 .../expected.json | 0 .../ignore-one-resource-attribute/actual.json | 0 .../expected.json | 0 .../testdata/ignore-single-metric/actual.json | 0 .../ignore-single-metric/expected.json | 0 .../actual.json | 0 .../expected.json | 0 .../actual.json | 0 .../expected.json | 0 .../testdata/ignore-timestamp/actual.json | 0 .../testdata/ignore-timestamp/expected.json | 0 .../metric-description-mismatch/actual.json | 0 .../metric-description-mismatch/expected.json | 0 .../testdata/metric-name-mismatch/actual.json | 0 .../metric-name-mismatch/expected.json | 0 .../testdata/metric-slice-extra/actual.json | 0 .../testdata/metric-slice-extra/expected.json | 0 .../testdata/metric-slice-missing/actual.json | 0 .../metric-slice-missing/expected.json | 0 .../metric-type-expect-gauge/actual.json | 0 .../metric-type-expect-gauge/expected.json | 0 .../metric-type-expect-sum/actual.json | 0 .../metric-type-expect-sum/expected.json | 0 .../testdata/metric-unit-mismatch/actual.json | 0 .../metric-unit-mismatch/expected.json | 0 .../resource-attributes-mismatch/actual.json | 0 .../expected.json | 0 .../testdata/resource-extra/actual.json | 0 .../testdata/resource-extra/expected.json | 0 .../actual.json | 0 .../expected.json | 0 .../actual.json | 0 .../expected.json | 0 .../actual.json | 0 .../expected.json | 0 .../actual.json | 0 .../expected.json | 0 .../testdata/resource-missing/actual.json | 0 .../testdata/resource-missing/expected.json | 0 .../sort-unordered-metric-slice/actual.json | 0 .../sort-unordered-metric-slice/expected.json | 0 .../actual.json | 0 .../expected.json | 0 internal/{scrapertest => comparetest}/util.go | 2 +- pkg/winperfcounters/go.mod | 2 +- processor/metricstransformprocessor/go.mod | 4 +- .../metrics_transform_processor_group_test.go | 6 +-- receiver/activedirectorydsreceiver/go.mod | 4 +- .../integration_test.go | 6 +-- .../activedirectorydsreceiver/scraper_test.go | 8 ++-- receiver/aerospikereceiver/go.mod | 4 +- .../aerospikereceiver/integration_test.go | 7 ++- receiver/aerospikereceiver/scraper_test.go | 4 +- receiver/apachereceiver/go.mod | 4 +- receiver/apachereceiver/integration_test.go | 6 +-- receiver/apachereceiver/scraper_test.go | 6 +-- receiver/bigipreceiver/go.mod | 4 +- receiver/bigipreceiver/integration_test.go | 6 +-- receiver/bigipreceiver/scraper_test.go | 6 +-- receiver/couchdbreceiver/go.mod | 4 +- receiver/couchdbreceiver/scraper_test.go | 10 ++-- receiver/dockerstatsreceiver/go.mod | 4 +- receiver/dockerstatsreceiver/receiver_test.go | 6 +-- receiver/elasticsearchreceiver/go.mod | 4 +- .../elasticsearchreceiver/integration_test.go | 8 ++-- .../elasticsearchreceiver/scraper_test.go | 10 ++-- receiver/expvarreceiver/go.mod | 4 +- receiver/expvarreceiver/scraper_test.go | 10 ++-- receiver/flinkmetricsreceiver/go.mod | 4 +- .../flinkmetricsreceiver/integration_test.go | 6 +-- receiver/flinkmetricsreceiver/scraper_test.go | 6 +-- receiver/httpcheckreceiver/go.mod | 4 +- receiver/httpcheckreceiver/scraper_test.go | 28 +++++------ receiver/iisreceiver/go.mod | 4 +- receiver/iisreceiver/integration_test.go | 10 ++-- receiver/iisreceiver/scraper_test.go | 6 +-- receiver/memcachedreceiver/go.mod | 4 +- .../memcachedreceiver/integration_test.go | 4 +- receiver/memcachedreceiver/scraper_test.go | 6 +-- receiver/mongodbreceiver/go.mod | 4 +- receiver/mongodbreceiver/integration_test.go | 12 ++--- receiver/mongodbreceiver/scraper_test.go | 6 +-- receiver/mysqlreceiver/go.mod | 4 +- receiver/mysqlreceiver/integration_test.go | 6 +-- receiver/mysqlreceiver/scraper_test.go | 8 ++-- receiver/nginxreceiver/go.mod | 4 +- receiver/nginxreceiver/integration_test.go | 6 +-- receiver/nginxreceiver/scraper_test.go | 6 +-- receiver/nsxtreceiver/go.mod | 4 +- receiver/nsxtreceiver/scraper_test.go | 6 +-- receiver/postgresqlreceiver/go.mod | 4 +- .../postgresqlreceiver/integration_test.go | 10 ++-- receiver/postgresqlreceiver/scraper_test.go | 16 +++---- receiver/rabbitmqreceiver/go.mod | 4 +- receiver/rabbitmqreceiver/integration_test.go | 6 +-- receiver/rabbitmqreceiver/scraper_test.go | 6 +-- receiver/riakreceiver/go.mod | 4 +- receiver/riakreceiver/integration_test.go | 6 +-- receiver/riakreceiver/scraper_test.go | 6 +-- receiver/saphanareceiver/go.mod | 4 +- receiver/saphanareceiver/scraper_test.go | 8 ++-- receiver/snmpreceiver/go.mod | 4 +- receiver/snmpreceiver/integration_test.go | 6 +-- receiver/snmpreceiver/scraper_test.go | 48 +++++++++---------- receiver/sqlqueryreceiver/go.mod | 2 +- receiver/sqlserverreceiver/go.mod | 4 +- receiver/sqlserverreceiver/scraper_test.go | 6 +-- receiver/vcenterreceiver/go.mod | 4 +- receiver/vcenterreceiver/integration_test.go | 6 +-- receiver/vcenterreceiver/scraper_test.go | 6 +-- receiver/windowsperfcountersreceiver/go.mod | 4 +- .../windowsperfcounters_scraper_test.go | 6 +-- receiver/zookeeperreceiver/go.mod | 4 +- receiver/zookeeperreceiver/scraper_test.go | 6 +-- versions.yaml | 2 +- 184 files changed, 257 insertions(+), 258 deletions(-) rename internal/{scrapertest => comparetest}/Makefile (100%) rename internal/{scrapertest => comparetest}/README.md (92%) rename internal/{scrapertest => comparetest}/compare.go (98%) rename internal/{scrapertest => comparetest}/compare_test.go (99%) rename internal/{scrapertest => comparetest}/go.mod (98%) rename internal/{scrapertest => comparetest}/go.sum (100%) rename internal/{scrapertest => comparetest}/golden/golden.go (97%) rename internal/{scrapertest => comparetest}/golden/golden_test.go (100%) rename internal/{scrapertest => comparetest}/golden/testdata/roundtrip/expected.json (100%) rename internal/{scrapertest => comparetest}/mask.go (98%) rename internal/{scrapertest => comparetest}/sort/attributes.go (98%) rename internal/{scrapertest => comparetest}/sort/attributes_test.go (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-aggregation-expect-cumulative/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-aggregation-expect-cumulative/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-aggregation-expect-delta/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-aggregation-expect-delta/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-attribute-extra/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-attribute-extra/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-attribute-key/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-attribute-key/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-attribute-missing/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-attribute-missing/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-attribute-value/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-attribute-value/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-monotonic-expect-false/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-monotonic-expect-false/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-monotonic-expect-true/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-monotonic-expect-true/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-slice-dedup/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-slice-dedup/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-slice-extra/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-slice-extra/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-slice-missing/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-slice-missing/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-value-double-mismatch/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-value-double-mismatch/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-value-expect-double/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-value-expect-double/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-value-expect-int/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-value-expect-int/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-value-int-mismatch/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/data-point-value-int-mismatch/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/equal/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/equal/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-attribute-set-collision-order/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-attribute-set-collision-order/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-attribute-set-collision/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-attribute-set-collision/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-data-point-value-double-mismatch/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-data-point-value-double-mismatch/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-data-point-value-int-mismatch/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-data-point-value-int-mismatch/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-each-attribute-value/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-each-attribute-value/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-global-attribute-value/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-global-attribute-value/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-one-attribute-value/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-one-attribute-value/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-one-resource-attribute-multiple-resources/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-one-resource-attribute-multiple-resources/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-one-resource-attribute/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-one-resource-attribute/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-single-metric/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-single-metric/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-subsequent-data-points-all/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-subsequent-data-points-all/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-subsequent-data-points-one/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-subsequent-data-points-one/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-timestamp/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/ignore-timestamp/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/metric-description-mismatch/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/metric-description-mismatch/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/metric-name-mismatch/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/metric-name-mismatch/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/metric-slice-extra/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/metric-slice-extra/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/metric-slice-missing/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/metric-slice-missing/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/metric-type-expect-gauge/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/metric-type-expect-gauge/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/metric-type-expect-sum/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/metric-type-expect-sum/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/metric-unit-mismatch/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/metric-unit-mismatch/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/resource-attributes-mismatch/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/resource-attributes-mismatch/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/resource-extra/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/resource-extra/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/resource-instrumentation-library-extra/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/resource-instrumentation-library-extra/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/resource-instrumentation-library-missing/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/resource-instrumentation-library-missing/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/resource-instrumentation-library-name-mismatch/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/resource-instrumentation-library-name-mismatch/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/resource-instrumentation-library-version-mismatch/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/resource-instrumentation-library-version-mismatch/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/resource-missing/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/resource-missing/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/sort-unordered-metric-slice/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/sort-unordered-metric-slice/expected.json (100%) rename internal/{scrapertest => comparetest}/testdata/sort-unordered-resource-metrics/actual.json (100%) rename internal/{scrapertest => comparetest}/testdata/sort-unordered-resource-metrics/expected.json (100%) rename internal/{scrapertest => comparetest}/util.go (94%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 66c0b0b86f75..fc22a4c95f1b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -101,7 +101,7 @@ internal/docker/ @open-telemetry/collector-c internal/k8sconfig/ @open-telemetry/collector-contrib-approvers @pmcollins @dmitryax internal/kubelet/ @open-telemetry/collector-contrib-approvers @dmitryax internal/metadataproviders/ @open-telemetry/collector-contrib-approvers @jrcamp @Aneurysm9 @dashpole -internal/scrapertest/ @open-telemetry/collector-contrib-approvers @djaglowski +internal/comparetest/ @open-telemetry/collector-contrib-approvers @djaglowski internal/splunk/ @open-telemetry/collector-contrib-approvers @pmcollins @dmitryax internal/tools/ @open-telemetry/collector-contrib-approvers internal/coreinternal/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index ec042767094c..a0d2f2f8fcdd 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -89,13 +89,13 @@ body: - extension/storage/dbstorage - extension/storage/filestorage - internal/aws + - internal/comparetest - internal/core - internal/docker - internal/filter - internal/k8sconfig - internal/kubelet - internal/metadataproviders - - internal/scrapertest - internal/sharedcomponent - internal/splunk - internal/tools diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index 88b757445462..640ec03a9fc9 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -83,13 +83,13 @@ body: - extension/storage/dbstorage - extension/storage/filestorage - internal/aws + - internal/comparetest - internal/core - internal/docker - internal/filter - internal/k8sconfig - internal/kubelet - internal/metadataproviders - - internal/scrapertest - internal/sharedcomponent - internal/splunk - internal/tools diff --git a/.github/ISSUE_TEMPLATE/other.yaml b/.github/ISSUE_TEMPLATE/other.yaml index 2ce715ed50d0..6f3821748fad 100644 --- a/.github/ISSUE_TEMPLATE/other.yaml +++ b/.github/ISSUE_TEMPLATE/other.yaml @@ -83,13 +83,13 @@ body: - extension/storage/dbstorage - extension/storage/filestorage - internal/aws + - internal/comparetest - internal/core - internal/docker - internal/filter - internal/k8sconfig - internal/kubelet - internal/metadataproviders - - internal/scrapertest - internal/sharedcomponent - internal/splunk - internal/tools diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6a57499cdd15..d44d257348c9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -346,6 +346,10 @@ updates: directory: "/internal/common" schedule: interval: "weekly" + - package-ecosystem: "gomod" + directory: "/internal/comparetest" + schedule: + interval: "weekly" - package-ecosystem: "gomod" directory: "/internal/coreinternal" schedule: @@ -370,10 +374,6 @@ updates: directory: "/internal/metadataproviders" schedule: interval: "weekly" - - package-ecosystem: "gomod" - directory: "/internal/scrapertest" - schedule: - interval: "weekly" - package-ecosystem: "gomod" directory: "/internal/sharedcomponent" schedule: diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 8d0efc226455..63cc0c9cfeab 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -714,7 +714,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubel replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders => ../../internal/metadataproviders -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent => ../../internal/sharedcomponent diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 23f21cc5b074..02156eb771b7 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -734,7 +734,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/metad replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => ../../internal/aws/metrics -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver => ../../receiver/otlpjsonfilereceiver diff --git a/cmd/oteltestbedcol/go.mod b/cmd/oteltestbedcol/go.mod index 545199937683..f5cc97feec60 100644 --- a/cmd/oteltestbedcol/go.mod +++ b/cmd/oteltestbedcol/go.mod @@ -282,7 +282,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/f5clo replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => ../../internal/splunk -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver => ../../receiver/dotnetdiagnosticsreceiver diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 0a722f6acc85..05cb694aa03b 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -215,7 +215,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => ../../extension/storage -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter => ../../internal/filter diff --git a/go.mod b/go.mod index ea46a676698b..bf905215e6b9 100644 --- a/go.mod +++ b/go.mod @@ -718,7 +718,7 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubel replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders => ./internal/metadataproviders -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ./internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ./internal/comparetest replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent => ./internal/sharedcomponent diff --git a/internal/scrapertest/Makefile b/internal/comparetest/Makefile similarity index 100% rename from internal/scrapertest/Makefile rename to internal/comparetest/Makefile diff --git a/internal/scrapertest/README.md b/internal/comparetest/README.md similarity index 92% rename from internal/scrapertest/README.md rename to internal/comparetest/README.md index 000e7c03eb9a..bbcc2750f1f9 100644 --- a/internal/scrapertest/README.md +++ b/internal/comparetest/README.md @@ -1,4 +1,4 @@ -# scrapertest +# comparetest This module provides a mechanism for capturing and comparing expected metric results. @@ -23,7 +23,7 @@ func TestScraper(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } ``` @@ -60,6 +60,6 @@ func TestScraper(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } ``` diff --git a/internal/scrapertest/compare.go b/internal/comparetest/compare.go similarity index 98% rename from internal/scrapertest/compare.go rename to internal/comparetest/compare.go index 3f6fbfb6de30..f6bbfb081c7f 100644 --- a/internal/scrapertest/compare.go +++ b/internal/comparetest/compare.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package scrapertest // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" +package comparetest // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" import ( "fmt" diff --git a/internal/scrapertest/compare_test.go b/internal/comparetest/compare_test.go similarity index 99% rename from internal/scrapertest/compare_test.go rename to internal/comparetest/compare_test.go index 969488c03a12..16a07c20a678 100644 --- a/internal/scrapertest/compare_test.go +++ b/internal/comparetest/compare_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package scrapertest +package comparetest import ( "errors" @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/multierr" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) type expectation struct { diff --git a/internal/scrapertest/go.mod b/internal/comparetest/go.mod similarity index 98% rename from internal/scrapertest/go.mod rename to internal/comparetest/go.mod index 6a7dfc2193ed..09f580e22f87 100644 --- a/internal/scrapertest/go.mod +++ b/internal/comparetest/go.mod @@ -1,4 +1,4 @@ -module github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest +module github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest go 1.18 diff --git a/internal/scrapertest/go.sum b/internal/comparetest/go.sum similarity index 100% rename from internal/scrapertest/go.sum rename to internal/comparetest/go.sum diff --git a/internal/scrapertest/golden/golden.go b/internal/comparetest/golden/golden.go similarity index 97% rename from internal/scrapertest/golden/golden.go rename to internal/comparetest/golden/golden.go index 73b7deb787ad..317bf04570eb 100644 --- a/internal/scrapertest/golden/golden.go +++ b/internal/comparetest/golden/golden.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package golden // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" +package golden // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" import ( "encoding/json" diff --git a/internal/scrapertest/golden/golden_test.go b/internal/comparetest/golden/golden_test.go similarity index 100% rename from internal/scrapertest/golden/golden_test.go rename to internal/comparetest/golden/golden_test.go diff --git a/internal/scrapertest/golden/testdata/roundtrip/expected.json b/internal/comparetest/golden/testdata/roundtrip/expected.json similarity index 100% rename from internal/scrapertest/golden/testdata/roundtrip/expected.json rename to internal/comparetest/golden/testdata/roundtrip/expected.json diff --git a/internal/scrapertest/mask.go b/internal/comparetest/mask.go similarity index 98% rename from internal/scrapertest/mask.go rename to internal/comparetest/mask.go index de96f02c942f..a2b84d2d6269 100644 --- a/internal/scrapertest/mask.go +++ b/internal/comparetest/mask.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package scrapertest // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" +package comparetest // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" import ( "fmt" diff --git a/internal/scrapertest/sort/attributes.go b/internal/comparetest/sort/attributes.go similarity index 98% rename from internal/scrapertest/sort/attributes.go rename to internal/comparetest/sort/attributes.go index 3c69fc6b96a0..13e8d6e56fea 100644 --- a/internal/scrapertest/sort/attributes.go +++ b/internal/comparetest/sort/attributes.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package sort // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/sort" +package sort // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/sort" import ( "strings" diff --git a/internal/scrapertest/sort/attributes_test.go b/internal/comparetest/sort/attributes_test.go similarity index 100% rename from internal/scrapertest/sort/attributes_test.go rename to internal/comparetest/sort/attributes_test.go diff --git a/internal/scrapertest/testdata/data-point-aggregation-expect-cumulative/actual.json b/internal/comparetest/testdata/data-point-aggregation-expect-cumulative/actual.json similarity index 100% rename from internal/scrapertest/testdata/data-point-aggregation-expect-cumulative/actual.json rename to internal/comparetest/testdata/data-point-aggregation-expect-cumulative/actual.json diff --git a/internal/scrapertest/testdata/data-point-aggregation-expect-cumulative/expected.json b/internal/comparetest/testdata/data-point-aggregation-expect-cumulative/expected.json similarity index 100% rename from internal/scrapertest/testdata/data-point-aggregation-expect-cumulative/expected.json rename to internal/comparetest/testdata/data-point-aggregation-expect-cumulative/expected.json diff --git a/internal/scrapertest/testdata/data-point-aggregation-expect-delta/actual.json b/internal/comparetest/testdata/data-point-aggregation-expect-delta/actual.json similarity index 100% rename from internal/scrapertest/testdata/data-point-aggregation-expect-delta/actual.json rename to internal/comparetest/testdata/data-point-aggregation-expect-delta/actual.json diff --git a/internal/scrapertest/testdata/data-point-aggregation-expect-delta/expected.json b/internal/comparetest/testdata/data-point-aggregation-expect-delta/expected.json similarity index 100% rename from internal/scrapertest/testdata/data-point-aggregation-expect-delta/expected.json rename to internal/comparetest/testdata/data-point-aggregation-expect-delta/expected.json diff --git a/internal/scrapertest/testdata/data-point-attribute-extra/actual.json b/internal/comparetest/testdata/data-point-attribute-extra/actual.json similarity index 100% rename from internal/scrapertest/testdata/data-point-attribute-extra/actual.json rename to internal/comparetest/testdata/data-point-attribute-extra/actual.json diff --git a/internal/scrapertest/testdata/data-point-attribute-extra/expected.json b/internal/comparetest/testdata/data-point-attribute-extra/expected.json similarity index 100% rename from internal/scrapertest/testdata/data-point-attribute-extra/expected.json rename to internal/comparetest/testdata/data-point-attribute-extra/expected.json diff --git a/internal/scrapertest/testdata/data-point-attribute-key/actual.json b/internal/comparetest/testdata/data-point-attribute-key/actual.json similarity index 100% rename from internal/scrapertest/testdata/data-point-attribute-key/actual.json rename to internal/comparetest/testdata/data-point-attribute-key/actual.json diff --git a/internal/scrapertest/testdata/data-point-attribute-key/expected.json b/internal/comparetest/testdata/data-point-attribute-key/expected.json similarity index 100% rename from internal/scrapertest/testdata/data-point-attribute-key/expected.json rename to internal/comparetest/testdata/data-point-attribute-key/expected.json diff --git a/internal/scrapertest/testdata/data-point-attribute-missing/actual.json b/internal/comparetest/testdata/data-point-attribute-missing/actual.json similarity index 100% rename from internal/scrapertest/testdata/data-point-attribute-missing/actual.json rename to internal/comparetest/testdata/data-point-attribute-missing/actual.json diff --git a/internal/scrapertest/testdata/data-point-attribute-missing/expected.json b/internal/comparetest/testdata/data-point-attribute-missing/expected.json similarity index 100% rename from internal/scrapertest/testdata/data-point-attribute-missing/expected.json rename to internal/comparetest/testdata/data-point-attribute-missing/expected.json diff --git a/internal/scrapertest/testdata/data-point-attribute-value/actual.json b/internal/comparetest/testdata/data-point-attribute-value/actual.json similarity index 100% rename from internal/scrapertest/testdata/data-point-attribute-value/actual.json rename to internal/comparetest/testdata/data-point-attribute-value/actual.json diff --git a/internal/scrapertest/testdata/data-point-attribute-value/expected.json b/internal/comparetest/testdata/data-point-attribute-value/expected.json similarity index 100% rename from internal/scrapertest/testdata/data-point-attribute-value/expected.json rename to internal/comparetest/testdata/data-point-attribute-value/expected.json diff --git a/internal/scrapertest/testdata/data-point-monotonic-expect-false/actual.json b/internal/comparetest/testdata/data-point-monotonic-expect-false/actual.json similarity index 100% rename from internal/scrapertest/testdata/data-point-monotonic-expect-false/actual.json rename to internal/comparetest/testdata/data-point-monotonic-expect-false/actual.json diff --git a/internal/scrapertest/testdata/data-point-monotonic-expect-false/expected.json b/internal/comparetest/testdata/data-point-monotonic-expect-false/expected.json similarity index 100% rename from internal/scrapertest/testdata/data-point-monotonic-expect-false/expected.json rename to internal/comparetest/testdata/data-point-monotonic-expect-false/expected.json diff --git a/internal/scrapertest/testdata/data-point-monotonic-expect-true/actual.json b/internal/comparetest/testdata/data-point-monotonic-expect-true/actual.json similarity index 100% rename from internal/scrapertest/testdata/data-point-monotonic-expect-true/actual.json rename to internal/comparetest/testdata/data-point-monotonic-expect-true/actual.json diff --git a/internal/scrapertest/testdata/data-point-monotonic-expect-true/expected.json b/internal/comparetest/testdata/data-point-monotonic-expect-true/expected.json similarity index 100% rename from internal/scrapertest/testdata/data-point-monotonic-expect-true/expected.json rename to internal/comparetest/testdata/data-point-monotonic-expect-true/expected.json diff --git a/internal/scrapertest/testdata/data-point-slice-dedup/actual.json b/internal/comparetest/testdata/data-point-slice-dedup/actual.json similarity index 100% rename from internal/scrapertest/testdata/data-point-slice-dedup/actual.json rename to internal/comparetest/testdata/data-point-slice-dedup/actual.json diff --git a/internal/scrapertest/testdata/data-point-slice-dedup/expected.json b/internal/comparetest/testdata/data-point-slice-dedup/expected.json similarity index 100% rename from internal/scrapertest/testdata/data-point-slice-dedup/expected.json rename to internal/comparetest/testdata/data-point-slice-dedup/expected.json diff --git a/internal/scrapertest/testdata/data-point-slice-extra/actual.json b/internal/comparetest/testdata/data-point-slice-extra/actual.json similarity index 100% rename from internal/scrapertest/testdata/data-point-slice-extra/actual.json rename to internal/comparetest/testdata/data-point-slice-extra/actual.json diff --git a/internal/scrapertest/testdata/data-point-slice-extra/expected.json b/internal/comparetest/testdata/data-point-slice-extra/expected.json similarity index 100% rename from internal/scrapertest/testdata/data-point-slice-extra/expected.json rename to internal/comparetest/testdata/data-point-slice-extra/expected.json diff --git a/internal/scrapertest/testdata/data-point-slice-missing/actual.json b/internal/comparetest/testdata/data-point-slice-missing/actual.json similarity index 100% rename from internal/scrapertest/testdata/data-point-slice-missing/actual.json rename to internal/comparetest/testdata/data-point-slice-missing/actual.json diff --git a/internal/scrapertest/testdata/data-point-slice-missing/expected.json b/internal/comparetest/testdata/data-point-slice-missing/expected.json similarity index 100% rename from internal/scrapertest/testdata/data-point-slice-missing/expected.json rename to internal/comparetest/testdata/data-point-slice-missing/expected.json diff --git a/internal/scrapertest/testdata/data-point-value-double-mismatch/actual.json b/internal/comparetest/testdata/data-point-value-double-mismatch/actual.json similarity index 100% rename from internal/scrapertest/testdata/data-point-value-double-mismatch/actual.json rename to internal/comparetest/testdata/data-point-value-double-mismatch/actual.json diff --git a/internal/scrapertest/testdata/data-point-value-double-mismatch/expected.json b/internal/comparetest/testdata/data-point-value-double-mismatch/expected.json similarity index 100% rename from internal/scrapertest/testdata/data-point-value-double-mismatch/expected.json rename to internal/comparetest/testdata/data-point-value-double-mismatch/expected.json diff --git a/internal/scrapertest/testdata/data-point-value-expect-double/actual.json b/internal/comparetest/testdata/data-point-value-expect-double/actual.json similarity index 100% rename from internal/scrapertest/testdata/data-point-value-expect-double/actual.json rename to internal/comparetest/testdata/data-point-value-expect-double/actual.json diff --git a/internal/scrapertest/testdata/data-point-value-expect-double/expected.json b/internal/comparetest/testdata/data-point-value-expect-double/expected.json similarity index 100% rename from internal/scrapertest/testdata/data-point-value-expect-double/expected.json rename to internal/comparetest/testdata/data-point-value-expect-double/expected.json diff --git a/internal/scrapertest/testdata/data-point-value-expect-int/actual.json b/internal/comparetest/testdata/data-point-value-expect-int/actual.json similarity index 100% rename from internal/scrapertest/testdata/data-point-value-expect-int/actual.json rename to internal/comparetest/testdata/data-point-value-expect-int/actual.json diff --git a/internal/scrapertest/testdata/data-point-value-expect-int/expected.json b/internal/comparetest/testdata/data-point-value-expect-int/expected.json similarity index 100% rename from internal/scrapertest/testdata/data-point-value-expect-int/expected.json rename to internal/comparetest/testdata/data-point-value-expect-int/expected.json diff --git a/internal/scrapertest/testdata/data-point-value-int-mismatch/actual.json b/internal/comparetest/testdata/data-point-value-int-mismatch/actual.json similarity index 100% rename from internal/scrapertest/testdata/data-point-value-int-mismatch/actual.json rename to internal/comparetest/testdata/data-point-value-int-mismatch/actual.json diff --git a/internal/scrapertest/testdata/data-point-value-int-mismatch/expected.json b/internal/comparetest/testdata/data-point-value-int-mismatch/expected.json similarity index 100% rename from internal/scrapertest/testdata/data-point-value-int-mismatch/expected.json rename to internal/comparetest/testdata/data-point-value-int-mismatch/expected.json diff --git a/internal/scrapertest/testdata/equal/actual.json b/internal/comparetest/testdata/equal/actual.json similarity index 100% rename from internal/scrapertest/testdata/equal/actual.json rename to internal/comparetest/testdata/equal/actual.json diff --git a/internal/scrapertest/testdata/equal/expected.json b/internal/comparetest/testdata/equal/expected.json similarity index 100% rename from internal/scrapertest/testdata/equal/expected.json rename to internal/comparetest/testdata/equal/expected.json diff --git a/internal/scrapertest/testdata/ignore-attribute-set-collision-order/actual.json b/internal/comparetest/testdata/ignore-attribute-set-collision-order/actual.json similarity index 100% rename from internal/scrapertest/testdata/ignore-attribute-set-collision-order/actual.json rename to internal/comparetest/testdata/ignore-attribute-set-collision-order/actual.json diff --git a/internal/scrapertest/testdata/ignore-attribute-set-collision-order/expected.json b/internal/comparetest/testdata/ignore-attribute-set-collision-order/expected.json similarity index 100% rename from internal/scrapertest/testdata/ignore-attribute-set-collision-order/expected.json rename to internal/comparetest/testdata/ignore-attribute-set-collision-order/expected.json diff --git a/internal/scrapertest/testdata/ignore-attribute-set-collision/actual.json b/internal/comparetest/testdata/ignore-attribute-set-collision/actual.json similarity index 100% rename from internal/scrapertest/testdata/ignore-attribute-set-collision/actual.json rename to internal/comparetest/testdata/ignore-attribute-set-collision/actual.json diff --git a/internal/scrapertest/testdata/ignore-attribute-set-collision/expected.json b/internal/comparetest/testdata/ignore-attribute-set-collision/expected.json similarity index 100% rename from internal/scrapertest/testdata/ignore-attribute-set-collision/expected.json rename to internal/comparetest/testdata/ignore-attribute-set-collision/expected.json diff --git a/internal/scrapertest/testdata/ignore-data-point-value-double-mismatch/actual.json b/internal/comparetest/testdata/ignore-data-point-value-double-mismatch/actual.json similarity index 100% rename from internal/scrapertest/testdata/ignore-data-point-value-double-mismatch/actual.json rename to internal/comparetest/testdata/ignore-data-point-value-double-mismatch/actual.json diff --git a/internal/scrapertest/testdata/ignore-data-point-value-double-mismatch/expected.json b/internal/comparetest/testdata/ignore-data-point-value-double-mismatch/expected.json similarity index 100% rename from internal/scrapertest/testdata/ignore-data-point-value-double-mismatch/expected.json rename to internal/comparetest/testdata/ignore-data-point-value-double-mismatch/expected.json diff --git a/internal/scrapertest/testdata/ignore-data-point-value-int-mismatch/actual.json b/internal/comparetest/testdata/ignore-data-point-value-int-mismatch/actual.json similarity index 100% rename from internal/scrapertest/testdata/ignore-data-point-value-int-mismatch/actual.json rename to internal/comparetest/testdata/ignore-data-point-value-int-mismatch/actual.json diff --git a/internal/scrapertest/testdata/ignore-data-point-value-int-mismatch/expected.json b/internal/comparetest/testdata/ignore-data-point-value-int-mismatch/expected.json similarity index 100% rename from internal/scrapertest/testdata/ignore-data-point-value-int-mismatch/expected.json rename to internal/comparetest/testdata/ignore-data-point-value-int-mismatch/expected.json diff --git a/internal/scrapertest/testdata/ignore-each-attribute-value/actual.json b/internal/comparetest/testdata/ignore-each-attribute-value/actual.json similarity index 100% rename from internal/scrapertest/testdata/ignore-each-attribute-value/actual.json rename to internal/comparetest/testdata/ignore-each-attribute-value/actual.json diff --git a/internal/scrapertest/testdata/ignore-each-attribute-value/expected.json b/internal/comparetest/testdata/ignore-each-attribute-value/expected.json similarity index 100% rename from internal/scrapertest/testdata/ignore-each-attribute-value/expected.json rename to internal/comparetest/testdata/ignore-each-attribute-value/expected.json diff --git a/internal/scrapertest/testdata/ignore-global-attribute-value/actual.json b/internal/comparetest/testdata/ignore-global-attribute-value/actual.json similarity index 100% rename from internal/scrapertest/testdata/ignore-global-attribute-value/actual.json rename to internal/comparetest/testdata/ignore-global-attribute-value/actual.json diff --git a/internal/scrapertest/testdata/ignore-global-attribute-value/expected.json b/internal/comparetest/testdata/ignore-global-attribute-value/expected.json similarity index 100% rename from internal/scrapertest/testdata/ignore-global-attribute-value/expected.json rename to internal/comparetest/testdata/ignore-global-attribute-value/expected.json diff --git a/internal/scrapertest/testdata/ignore-one-attribute-value/actual.json b/internal/comparetest/testdata/ignore-one-attribute-value/actual.json similarity index 100% rename from internal/scrapertest/testdata/ignore-one-attribute-value/actual.json rename to internal/comparetest/testdata/ignore-one-attribute-value/actual.json diff --git a/internal/scrapertest/testdata/ignore-one-attribute-value/expected.json b/internal/comparetest/testdata/ignore-one-attribute-value/expected.json similarity index 100% rename from internal/scrapertest/testdata/ignore-one-attribute-value/expected.json rename to internal/comparetest/testdata/ignore-one-attribute-value/expected.json diff --git a/internal/scrapertest/testdata/ignore-one-resource-attribute-multiple-resources/actual.json b/internal/comparetest/testdata/ignore-one-resource-attribute-multiple-resources/actual.json similarity index 100% rename from internal/scrapertest/testdata/ignore-one-resource-attribute-multiple-resources/actual.json rename to internal/comparetest/testdata/ignore-one-resource-attribute-multiple-resources/actual.json diff --git a/internal/scrapertest/testdata/ignore-one-resource-attribute-multiple-resources/expected.json b/internal/comparetest/testdata/ignore-one-resource-attribute-multiple-resources/expected.json similarity index 100% rename from internal/scrapertest/testdata/ignore-one-resource-attribute-multiple-resources/expected.json rename to internal/comparetest/testdata/ignore-one-resource-attribute-multiple-resources/expected.json diff --git a/internal/scrapertest/testdata/ignore-one-resource-attribute/actual.json b/internal/comparetest/testdata/ignore-one-resource-attribute/actual.json similarity index 100% rename from internal/scrapertest/testdata/ignore-one-resource-attribute/actual.json rename to internal/comparetest/testdata/ignore-one-resource-attribute/actual.json diff --git a/internal/scrapertest/testdata/ignore-one-resource-attribute/expected.json b/internal/comparetest/testdata/ignore-one-resource-attribute/expected.json similarity index 100% rename from internal/scrapertest/testdata/ignore-one-resource-attribute/expected.json rename to internal/comparetest/testdata/ignore-one-resource-attribute/expected.json diff --git a/internal/scrapertest/testdata/ignore-single-metric/actual.json b/internal/comparetest/testdata/ignore-single-metric/actual.json similarity index 100% rename from internal/scrapertest/testdata/ignore-single-metric/actual.json rename to internal/comparetest/testdata/ignore-single-metric/actual.json diff --git a/internal/scrapertest/testdata/ignore-single-metric/expected.json b/internal/comparetest/testdata/ignore-single-metric/expected.json similarity index 100% rename from internal/scrapertest/testdata/ignore-single-metric/expected.json rename to internal/comparetest/testdata/ignore-single-metric/expected.json diff --git a/internal/scrapertest/testdata/ignore-subsequent-data-points-all/actual.json b/internal/comparetest/testdata/ignore-subsequent-data-points-all/actual.json similarity index 100% rename from internal/scrapertest/testdata/ignore-subsequent-data-points-all/actual.json rename to internal/comparetest/testdata/ignore-subsequent-data-points-all/actual.json diff --git a/internal/scrapertest/testdata/ignore-subsequent-data-points-all/expected.json b/internal/comparetest/testdata/ignore-subsequent-data-points-all/expected.json similarity index 100% rename from internal/scrapertest/testdata/ignore-subsequent-data-points-all/expected.json rename to internal/comparetest/testdata/ignore-subsequent-data-points-all/expected.json diff --git a/internal/scrapertest/testdata/ignore-subsequent-data-points-one/actual.json b/internal/comparetest/testdata/ignore-subsequent-data-points-one/actual.json similarity index 100% rename from internal/scrapertest/testdata/ignore-subsequent-data-points-one/actual.json rename to internal/comparetest/testdata/ignore-subsequent-data-points-one/actual.json diff --git a/internal/scrapertest/testdata/ignore-subsequent-data-points-one/expected.json b/internal/comparetest/testdata/ignore-subsequent-data-points-one/expected.json similarity index 100% rename from internal/scrapertest/testdata/ignore-subsequent-data-points-one/expected.json rename to internal/comparetest/testdata/ignore-subsequent-data-points-one/expected.json diff --git a/internal/scrapertest/testdata/ignore-timestamp/actual.json b/internal/comparetest/testdata/ignore-timestamp/actual.json similarity index 100% rename from internal/scrapertest/testdata/ignore-timestamp/actual.json rename to internal/comparetest/testdata/ignore-timestamp/actual.json diff --git a/internal/scrapertest/testdata/ignore-timestamp/expected.json b/internal/comparetest/testdata/ignore-timestamp/expected.json similarity index 100% rename from internal/scrapertest/testdata/ignore-timestamp/expected.json rename to internal/comparetest/testdata/ignore-timestamp/expected.json diff --git a/internal/scrapertest/testdata/metric-description-mismatch/actual.json b/internal/comparetest/testdata/metric-description-mismatch/actual.json similarity index 100% rename from internal/scrapertest/testdata/metric-description-mismatch/actual.json rename to internal/comparetest/testdata/metric-description-mismatch/actual.json diff --git a/internal/scrapertest/testdata/metric-description-mismatch/expected.json b/internal/comparetest/testdata/metric-description-mismatch/expected.json similarity index 100% rename from internal/scrapertest/testdata/metric-description-mismatch/expected.json rename to internal/comparetest/testdata/metric-description-mismatch/expected.json diff --git a/internal/scrapertest/testdata/metric-name-mismatch/actual.json b/internal/comparetest/testdata/metric-name-mismatch/actual.json similarity index 100% rename from internal/scrapertest/testdata/metric-name-mismatch/actual.json rename to internal/comparetest/testdata/metric-name-mismatch/actual.json diff --git a/internal/scrapertest/testdata/metric-name-mismatch/expected.json b/internal/comparetest/testdata/metric-name-mismatch/expected.json similarity index 100% rename from internal/scrapertest/testdata/metric-name-mismatch/expected.json rename to internal/comparetest/testdata/metric-name-mismatch/expected.json diff --git a/internal/scrapertest/testdata/metric-slice-extra/actual.json b/internal/comparetest/testdata/metric-slice-extra/actual.json similarity index 100% rename from internal/scrapertest/testdata/metric-slice-extra/actual.json rename to internal/comparetest/testdata/metric-slice-extra/actual.json diff --git a/internal/scrapertest/testdata/metric-slice-extra/expected.json b/internal/comparetest/testdata/metric-slice-extra/expected.json similarity index 100% rename from internal/scrapertest/testdata/metric-slice-extra/expected.json rename to internal/comparetest/testdata/metric-slice-extra/expected.json diff --git a/internal/scrapertest/testdata/metric-slice-missing/actual.json b/internal/comparetest/testdata/metric-slice-missing/actual.json similarity index 100% rename from internal/scrapertest/testdata/metric-slice-missing/actual.json rename to internal/comparetest/testdata/metric-slice-missing/actual.json diff --git a/internal/scrapertest/testdata/metric-slice-missing/expected.json b/internal/comparetest/testdata/metric-slice-missing/expected.json similarity index 100% rename from internal/scrapertest/testdata/metric-slice-missing/expected.json rename to internal/comparetest/testdata/metric-slice-missing/expected.json diff --git a/internal/scrapertest/testdata/metric-type-expect-gauge/actual.json b/internal/comparetest/testdata/metric-type-expect-gauge/actual.json similarity index 100% rename from internal/scrapertest/testdata/metric-type-expect-gauge/actual.json rename to internal/comparetest/testdata/metric-type-expect-gauge/actual.json diff --git a/internal/scrapertest/testdata/metric-type-expect-gauge/expected.json b/internal/comparetest/testdata/metric-type-expect-gauge/expected.json similarity index 100% rename from internal/scrapertest/testdata/metric-type-expect-gauge/expected.json rename to internal/comparetest/testdata/metric-type-expect-gauge/expected.json diff --git a/internal/scrapertest/testdata/metric-type-expect-sum/actual.json b/internal/comparetest/testdata/metric-type-expect-sum/actual.json similarity index 100% rename from internal/scrapertest/testdata/metric-type-expect-sum/actual.json rename to internal/comparetest/testdata/metric-type-expect-sum/actual.json diff --git a/internal/scrapertest/testdata/metric-type-expect-sum/expected.json b/internal/comparetest/testdata/metric-type-expect-sum/expected.json similarity index 100% rename from internal/scrapertest/testdata/metric-type-expect-sum/expected.json rename to internal/comparetest/testdata/metric-type-expect-sum/expected.json diff --git a/internal/scrapertest/testdata/metric-unit-mismatch/actual.json b/internal/comparetest/testdata/metric-unit-mismatch/actual.json similarity index 100% rename from internal/scrapertest/testdata/metric-unit-mismatch/actual.json rename to internal/comparetest/testdata/metric-unit-mismatch/actual.json diff --git a/internal/scrapertest/testdata/metric-unit-mismatch/expected.json b/internal/comparetest/testdata/metric-unit-mismatch/expected.json similarity index 100% rename from internal/scrapertest/testdata/metric-unit-mismatch/expected.json rename to internal/comparetest/testdata/metric-unit-mismatch/expected.json diff --git a/internal/scrapertest/testdata/resource-attributes-mismatch/actual.json b/internal/comparetest/testdata/resource-attributes-mismatch/actual.json similarity index 100% rename from internal/scrapertest/testdata/resource-attributes-mismatch/actual.json rename to internal/comparetest/testdata/resource-attributes-mismatch/actual.json diff --git a/internal/scrapertest/testdata/resource-attributes-mismatch/expected.json b/internal/comparetest/testdata/resource-attributes-mismatch/expected.json similarity index 100% rename from internal/scrapertest/testdata/resource-attributes-mismatch/expected.json rename to internal/comparetest/testdata/resource-attributes-mismatch/expected.json diff --git a/internal/scrapertest/testdata/resource-extra/actual.json b/internal/comparetest/testdata/resource-extra/actual.json similarity index 100% rename from internal/scrapertest/testdata/resource-extra/actual.json rename to internal/comparetest/testdata/resource-extra/actual.json diff --git a/internal/scrapertest/testdata/resource-extra/expected.json b/internal/comparetest/testdata/resource-extra/expected.json similarity index 100% rename from internal/scrapertest/testdata/resource-extra/expected.json rename to internal/comparetest/testdata/resource-extra/expected.json diff --git a/internal/scrapertest/testdata/resource-instrumentation-library-extra/actual.json b/internal/comparetest/testdata/resource-instrumentation-library-extra/actual.json similarity index 100% rename from internal/scrapertest/testdata/resource-instrumentation-library-extra/actual.json rename to internal/comparetest/testdata/resource-instrumentation-library-extra/actual.json diff --git a/internal/scrapertest/testdata/resource-instrumentation-library-extra/expected.json b/internal/comparetest/testdata/resource-instrumentation-library-extra/expected.json similarity index 100% rename from internal/scrapertest/testdata/resource-instrumentation-library-extra/expected.json rename to internal/comparetest/testdata/resource-instrumentation-library-extra/expected.json diff --git a/internal/scrapertest/testdata/resource-instrumentation-library-missing/actual.json b/internal/comparetest/testdata/resource-instrumentation-library-missing/actual.json similarity index 100% rename from internal/scrapertest/testdata/resource-instrumentation-library-missing/actual.json rename to internal/comparetest/testdata/resource-instrumentation-library-missing/actual.json diff --git a/internal/scrapertest/testdata/resource-instrumentation-library-missing/expected.json b/internal/comparetest/testdata/resource-instrumentation-library-missing/expected.json similarity index 100% rename from internal/scrapertest/testdata/resource-instrumentation-library-missing/expected.json rename to internal/comparetest/testdata/resource-instrumentation-library-missing/expected.json diff --git a/internal/scrapertest/testdata/resource-instrumentation-library-name-mismatch/actual.json b/internal/comparetest/testdata/resource-instrumentation-library-name-mismatch/actual.json similarity index 100% rename from internal/scrapertest/testdata/resource-instrumentation-library-name-mismatch/actual.json rename to internal/comparetest/testdata/resource-instrumentation-library-name-mismatch/actual.json diff --git a/internal/scrapertest/testdata/resource-instrumentation-library-name-mismatch/expected.json b/internal/comparetest/testdata/resource-instrumentation-library-name-mismatch/expected.json similarity index 100% rename from internal/scrapertest/testdata/resource-instrumentation-library-name-mismatch/expected.json rename to internal/comparetest/testdata/resource-instrumentation-library-name-mismatch/expected.json diff --git a/internal/scrapertest/testdata/resource-instrumentation-library-version-mismatch/actual.json b/internal/comparetest/testdata/resource-instrumentation-library-version-mismatch/actual.json similarity index 100% rename from internal/scrapertest/testdata/resource-instrumentation-library-version-mismatch/actual.json rename to internal/comparetest/testdata/resource-instrumentation-library-version-mismatch/actual.json diff --git a/internal/scrapertest/testdata/resource-instrumentation-library-version-mismatch/expected.json b/internal/comparetest/testdata/resource-instrumentation-library-version-mismatch/expected.json similarity index 100% rename from internal/scrapertest/testdata/resource-instrumentation-library-version-mismatch/expected.json rename to internal/comparetest/testdata/resource-instrumentation-library-version-mismatch/expected.json diff --git a/internal/scrapertest/testdata/resource-missing/actual.json b/internal/comparetest/testdata/resource-missing/actual.json similarity index 100% rename from internal/scrapertest/testdata/resource-missing/actual.json rename to internal/comparetest/testdata/resource-missing/actual.json diff --git a/internal/scrapertest/testdata/resource-missing/expected.json b/internal/comparetest/testdata/resource-missing/expected.json similarity index 100% rename from internal/scrapertest/testdata/resource-missing/expected.json rename to internal/comparetest/testdata/resource-missing/expected.json diff --git a/internal/scrapertest/testdata/sort-unordered-metric-slice/actual.json b/internal/comparetest/testdata/sort-unordered-metric-slice/actual.json similarity index 100% rename from internal/scrapertest/testdata/sort-unordered-metric-slice/actual.json rename to internal/comparetest/testdata/sort-unordered-metric-slice/actual.json diff --git a/internal/scrapertest/testdata/sort-unordered-metric-slice/expected.json b/internal/comparetest/testdata/sort-unordered-metric-slice/expected.json similarity index 100% rename from internal/scrapertest/testdata/sort-unordered-metric-slice/expected.json rename to internal/comparetest/testdata/sort-unordered-metric-slice/expected.json diff --git a/internal/scrapertest/testdata/sort-unordered-resource-metrics/actual.json b/internal/comparetest/testdata/sort-unordered-resource-metrics/actual.json similarity index 100% rename from internal/scrapertest/testdata/sort-unordered-resource-metrics/actual.json rename to internal/comparetest/testdata/sort-unordered-resource-metrics/actual.json diff --git a/internal/scrapertest/testdata/sort-unordered-resource-metrics/expected.json b/internal/comparetest/testdata/sort-unordered-resource-metrics/expected.json similarity index 100% rename from internal/scrapertest/testdata/sort-unordered-resource-metrics/expected.json rename to internal/comparetest/testdata/sort-unordered-resource-metrics/expected.json diff --git a/internal/scrapertest/util.go b/internal/comparetest/util.go similarity index 94% rename from internal/scrapertest/util.go rename to internal/comparetest/util.go index d47209d9b8a9..49285752bdf7 100644 --- a/internal/scrapertest/util.go +++ b/internal/comparetest/util.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package scrapertest // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" +package comparetest // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" import ( "fmt" diff --git a/pkg/winperfcounters/go.mod b/pkg/winperfcounters/go.mod index d8ae7bbfb663..238d58c87cd9 100644 --- a/pkg/winperfcounters/go.mod +++ b/pkg/winperfcounters/go.mod @@ -16,6 +16,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index af38a96f9f41..1b6382c81304 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/metri go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 @@ -50,6 +50,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/processor/metricstransformprocessor/metrics_transform_processor_group_test.go b/processor/metricstransformprocessor/metrics_transform_processor_group_test.go index 79c2a78ee596..612b1d0cf434 100644 --- a/processor/metricstransformprocessor/metrics_transform_processor_group_test.go +++ b/processor/metricstransformprocessor/metrics_transform_processor_group_test.go @@ -29,8 +29,8 @@ import ( "go.opentelemetry.io/collector/processor/processorhelper" "go.uber.org/zap" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) type metricsGroupingTest struct { @@ -102,7 +102,7 @@ func TestMetricsGrouping(t *testing.T) { got := next.AllMetrics() require.Equal(t, 1, len(got)) - require.NoError(t, scrapertest.CompareMetrics(expected, got[0], scrapertest.IgnoreMetricValues())) + require.NoError(t, comparetest.CompareMetrics(expected, got[0], comparetest.IgnoreMetricValues())) assert.NoError(t, mtp.Shutdown(context.Background())) }) diff --git a/receiver/activedirectorydsreceiver/go.mod b/receiver/activedirectorydsreceiver/go.mod index 39eb507f8ba4..cf90e4259476 100644 --- a/receiver/activedirectorydsreceiver/go.mod +++ b/receiver/activedirectorydsreceiver/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/google/go-cmp v0.5.9 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 github.com/stretchr/testify v1.8.1 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -44,7 +44,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters => ../../pkg/winperfcounters diff --git a/receiver/activedirectorydsreceiver/integration_test.go b/receiver/activedirectorydsreceiver/integration_test.go index 4956db120b7b..ce81928de74a 100644 --- a/receiver/activedirectorydsreceiver/integration_test.go +++ b/receiver/activedirectorydsreceiver/integration_test.go @@ -25,8 +25,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) /* @@ -54,7 +54,7 @@ func TestIntegration(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(goldenScrapePath) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, actualMetrics, scrapertest.IgnoreMetricValues()) + err = comparetest.CompareMetrics(expectedMetrics, actualMetrics, comparetest.IgnoreMetricValues()) require.NoError(t, err) err = recv.Shutdown(context.Background()) diff --git a/receiver/activedirectorydsreceiver/scraper_test.go b/receiver/activedirectorydsreceiver/scraper_test.go index ac56cc75cd81..864deaa2a19c 100644 --- a/receiver/activedirectorydsreceiver/scraper_test.go +++ b/receiver/activedirectorydsreceiver/scraper_test.go @@ -27,8 +27,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/receiver/scrapererror" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver/internal/metadata" ) @@ -56,7 +56,7 @@ func TestScrape(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(goldenScrapePath) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, scrapeData) + err = comparetest.CompareMetrics(expectedMetrics, scrapeData) require.NoError(t, err) err = scraper.shutdown(context.Background()) @@ -91,7 +91,7 @@ func TestScrape(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(partialScrapePath) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, scrapeData) + err = comparetest.CompareMetrics(expectedMetrics, scrapeData) require.NoError(t, err) err = scraper.shutdown(context.Background()) diff --git a/receiver/aerospikereceiver/go.mod b/receiver/aerospikereceiver/go.mod index 481624d70dec..e65c079d7c18 100644 --- a/receiver/aerospikereceiver/go.mod +++ b/receiver/aerospikereceiver/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/aerospike/aerospike-client-go/v6 v6.7.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -68,6 +68,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/aerospikereceiver/integration_test.go b/receiver/aerospikereceiver/integration_test.go index 15e5312543dc..8d150ce1cdda 100644 --- a/receiver/aerospikereceiver/integration_test.go +++ b/receiver/aerospikereceiver/integration_test.go @@ -34,8 +34,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) type doneCheckable interface { @@ -316,7 +315,7 @@ func TestAerospikeIntegration(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err, "failed reading expected metrics") - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics, scrapertest.IgnoreMetricValues(), scrapertest.IgnoreResourceAttributeValue("aerospike.node.name"))) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics, comparetest.IgnoreMetricValues(), comparetest.IgnoreResourceAttributeValue("aerospike.node.name"))) // now do a run in cluster mode cfg.CollectClusterMetrics = true @@ -338,6 +337,6 @@ func TestAerospikeIntegration(t *testing.T) { expectedMetrics, err = golden.ReadMetrics(expectedFile) require.NoError(t, err, "failed reading expected metrics") - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics, scrapertest.IgnoreMetricValues(), scrapertest.IgnoreResourceAttributeValue("aerospike.node.name"))) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics, comparetest.IgnoreMetricValues(), comparetest.IgnoreResourceAttributeValue("aerospike.node.name"))) } diff --git a/receiver/aerospikereceiver/scraper_test.go b/receiver/aerospikereceiver/scraper_test.go index f85c1089d052..a66779afe552 100644 --- a/receiver/aerospikereceiver/scraper_test.go +++ b/receiver/aerospikereceiver/scraper_test.go @@ -28,7 +28,7 @@ import ( "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/internal/metadata" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/mocks" ) @@ -152,7 +152,7 @@ func TestScrape_CollectClusterMetrics(t *testing.T) { require.EqualError(t, err, "failed to parse int64 for AerospikeNamespaceMemoryUsage, value was badval: strconv.ParseInt: parsing \"badval\": invalid syntax") expectedMetrics := expectedMB.Emit() - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) require.NoError(t, receiver.shutdown(context.Background())) diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index d6fb15e8368c..4bd3cb2c7cb4 100644 --- a/receiver/apachereceiver/go.mod +++ b/receiver/apachereceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apache go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -72,6 +72,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/apachereceiver/integration_test.go b/receiver/apachereceiver/integration_test.go index e67539aa30d0..7f76d0e1287c 100644 --- a/receiver/apachereceiver/integration_test.go +++ b/receiver/apachereceiver/integration_test.go @@ -36,8 +36,8 @@ import ( "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/featuregate" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) func TestApacheIntegration(t *testing.T) { @@ -81,7 +81,7 @@ func TestApacheIntegration(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics, scrapertest.IgnoreMetricValues())) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics, comparetest.IgnoreMetricValues())) } func getContainer(t *testing.T, req testcontainers.ContainerRequest) testcontainers.Container { diff --git a/receiver/apachereceiver/scraper_test.go b/receiver/apachereceiver/scraper_test.go index 49698896ab65..8f3faf1a4ac0 100644 --- a/receiver/apachereceiver/scraper_test.go +++ b/receiver/apachereceiver/scraper_test.go @@ -30,8 +30,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver/internal/metadata" ) @@ -62,7 +62,7 @@ func TestScraper(t *testing.T) { expectedMetrics.ResourceMetrics().At(0).Resource().Attributes().PutStr("apache.server.port", url.Port()) // The port is random, so we shouldn't check if this value matches. - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } func TestScraperFailedStart(t *testing.T) { diff --git a/receiver/bigipreceiver/go.mod b/receiver/bigipreceiver/go.mod index fd59364c124f..7a31bfcdd104 100644 --- a/receiver/bigipreceiver/go.mod +++ b/receiver/bigipreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipr go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 @@ -51,6 +51,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/bigipreceiver/integration_test.go b/receiver/bigipreceiver/integration_test.go index 9b860f7f8a47..e9f7b6f38efc 100644 --- a/receiver/bigipreceiver/integration_test.go +++ b/receiver/bigipreceiver/integration_test.go @@ -29,8 +29,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) func TestBigIpIntegration(t *testing.T) { @@ -63,7 +63,7 @@ func TestBigIpIntegration(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics, scrapertest.IgnoreMetricValues())) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics, comparetest.IgnoreMetricValues())) } const ( diff --git a/receiver/bigipreceiver/scraper_test.go b/receiver/bigipreceiver/scraper_test.go index 023d505b9c42..0a2872c0bc0a 100644 --- a/receiver/bigipreceiver/scraper_test.go +++ b/receiver/bigipreceiver/scraper_test.go @@ -30,8 +30,8 @@ import ( "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver/internal/mocks" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/bigipreceiver/internal/models" ) @@ -271,7 +271,7 @@ func TestScaperScrape(t *testing.T) { expectedMetrics := tc.expectedMetricGen(t) - err = scrapertest.CompareMetrics(expectedMetrics, actualMetrics) + err = comparetest.CompareMetrics(expectedMetrics, actualMetrics) require.NoError(t, err) }) } diff --git a/receiver/couchdbreceiver/go.mod b/receiver/couchdbreceiver/go.mod index a5fb82c26811..0103cd4b1096 100644 --- a/receiver/couchdbreceiver/go.mod +++ b/receiver/couchdbreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchd go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 @@ -54,6 +54,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/couchdbreceiver/scraper_test.go b/receiver/couchdbreceiver/scraper_test.go index fd9dba474d5d..32052a564385 100644 --- a/receiver/couchdbreceiver/scraper_test.go +++ b/receiver/couchdbreceiver/scraper_test.go @@ -34,8 +34,8 @@ import ( "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver/internal/metadata" ) @@ -59,7 +59,7 @@ func TestScrape(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) }) t.Run("scrape from couchdb 3.12", func(t *testing.T) { @@ -75,7 +75,7 @@ func TestScrape(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) }) t.Run("scrape returns nothing", func(t *testing.T) { @@ -176,7 +176,7 @@ func TestMetricSettings(t *testing.T) { expected, err := golden.ReadMetrics(filepath.Join("testdata", "scraper", "only_db_ops.json")) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expected, metrics)) + require.NoError(t, comparetest.CompareMetrics(expected, metrics)) require.Equal(t, metrics.MetricCount(), 1) } diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index a03d154e2149..322014d3f376 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( github.com/docker/docker v20.10.21+incompatible github.com/google/go-cmp v0.5.9 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -76,7 +76,7 @@ require ( replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker => ../../internal/docker -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest // see https://github.com/distribution/distribution/issues/3590 exclude github.com/docker/distribution v2.8.0+incompatible diff --git a/receiver/dockerstatsreceiver/receiver_test.go b/receiver/dockerstatsreceiver/receiver_test.go index eb303ed1ff19..d0852842e29c 100644 --- a/receiver/dockerstatsreceiver/receiver_test.go +++ b/receiver/dockerstatsreceiver/receiver_test.go @@ -33,8 +33,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/receiver/scraperhelper" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver/internal/metadata" ) @@ -204,7 +204,7 @@ func TestScrapeV2(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(tc.expectedMetricsFile) assert.NoError(t, err) - assert.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + assert.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) }) } } diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod index 93f89feb7fa9..9e2dd40d8fe8 100644 --- a/receiver/elasticsearchreceiver/go.mod +++ b/receiver/elasticsearchreceiver/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/google/go-cmp v0.5.9 github.com/hashicorp/go-version v1.6.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -75,6 +75,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/elasticsearchreceiver/integration_test.go b/receiver/elasticsearchreceiver/integration_test.go index 2633181fea78..63b715a5a168 100644 --- a/receiver/elasticsearchreceiver/integration_test.go +++ b/receiver/elasticsearchreceiver/integration_test.go @@ -30,8 +30,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) var ( @@ -87,7 +87,7 @@ func TestElasticsearchIntegration(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - scrapertest.CompareMetrics(expectedMetrics, actualMtrics, scrapertest.IgnoreMetricValues(), scrapertest.IgnoreResourceAttributeValue("elasticsearch.node.name")) + comparetest.CompareMetrics(expectedMetrics, actualMtrics, comparetest.IgnoreMetricValues(), comparetest.IgnoreResourceAttributeValue("elasticsearch.node.name")) }) t.Run("Running elasticsearch 7.16.3", func(t *testing.T) { t.Parallel() @@ -119,7 +119,7 @@ func TestElasticsearchIntegration(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - scrapertest.CompareMetrics(expectedMetrics, actualMtrics, scrapertest.IgnoreMetricValues(), scrapertest.IgnoreResourceAttributeValue("elasticsearch.node.name")) + comparetest.CompareMetrics(expectedMetrics, actualMtrics, comparetest.IgnoreMetricValues(), comparetest.IgnoreResourceAttributeValue("elasticsearch.node.name")) }) } diff --git a/receiver/elasticsearchreceiver/scraper_test.go b/receiver/elasticsearchreceiver/scraper_test.go index 61dc63e908f2..ad828c2cb8c7 100644 --- a/receiver/elasticsearchreceiver/scraper_test.go +++ b/receiver/elasticsearchreceiver/scraper_test.go @@ -29,8 +29,8 @@ import ( "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/receiver/scrapererror" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver/internal/mocks" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver/internal/model" ) @@ -94,7 +94,7 @@ func TestScraper(t *testing.T) { actualMetrics, err := sc.scrape(context.Background()) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } func TestScraperSkipClusterMetrics(t *testing.T) { @@ -123,7 +123,7 @@ func TestScraperSkipClusterMetrics(t *testing.T) { actualMetrics, err := sc.scrape(context.Background()) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } func TestScraperNoNodesMetrics(t *testing.T) { @@ -152,7 +152,7 @@ func TestScraperNoNodesMetrics(t *testing.T) { actualMetrics, err := sc.scrape(context.Background()) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } func TestScraperFailedStart(t *testing.T) { diff --git a/receiver/expvarreceiver/go.mod b/receiver/expvarreceiver/go.mod index 5b92bc8f6f92..90a8b0e3b2d4 100644 --- a/receiver/expvarreceiver/go.mod +++ b/receiver/expvarreceiver/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/google/go-cmp v0.5.9 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 @@ -50,6 +50,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/expvarreceiver/scraper_test.go b/receiver/expvarreceiver/scraper_test.go index 3ae5afa7ee95..090059cccae2 100644 --- a/receiver/expvarreceiver/scraper_test.go +++ b/receiver/expvarreceiver/scraper_test.go @@ -26,8 +26,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pmetric" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver/internal/metadata" ) @@ -123,7 +123,7 @@ func TestAllMetrics(t *testing.T) { expectedFile := filepath.Join("testdata", "metrics", "expected_all_metrics.json") expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } func TestNoMetrics(t *testing.T) { @@ -139,7 +139,7 @@ func TestNoMetrics(t *testing.T) { expectedMetrics := pmetric.NewMetrics() // empty actualMetrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } func TestNotFoundResponse(t *testing.T) { @@ -191,5 +191,5 @@ func TestEmptyResponseBodyError(t *testing.T) { expectedMetrics := pmetric.NewMetrics() // empty actualMetrics, err := scraper.scrape(context.Background()) require.EqualError(t, err, "could not decode response body to JSON: EOF") - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } diff --git a/receiver/flinkmetricsreceiver/go.mod b/receiver/flinkmetricsreceiver/go.mod index e3ad0af2234e..ff6904fdb1ed 100644 --- a/receiver/flinkmetricsreceiver/go.mod +++ b/receiver/flinkmetricsreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkm go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -72,6 +72,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/flinkmetricsreceiver/integration_test.go b/receiver/flinkmetricsreceiver/integration_test.go index daf2dab75c67..9a21b00962d1 100644 --- a/receiver/flinkmetricsreceiver/integration_test.go +++ b/receiver/flinkmetricsreceiver/integration_test.go @@ -36,8 +36,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) func TestFlinkIntegration(t *testing.T) { @@ -137,7 +137,7 @@ func TestFlinkIntegration(t *testing.T) { expectedFile := filepath.Join("testdata", "integration", "expected.json") expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics, scrapertest.IgnoreMetricValues())) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics, comparetest.IgnoreMetricValues())) } func getContainer(t *testing.T, req testcontainers.ContainerRequest) testcontainers.Container { diff --git a/receiver/flinkmetricsreceiver/scraper_test.go b/receiver/flinkmetricsreceiver/scraper_test.go index 6a4237104b94..398e683f552d 100644 --- a/receiver/flinkmetricsreceiver/scraper_test.go +++ b/receiver/flinkmetricsreceiver/scraper_test.go @@ -27,8 +27,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver/internal/mocks" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver/internal/models" ) @@ -268,7 +268,7 @@ func TestScraperScrape(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(tc.expectedMetricFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) }) } } diff --git a/receiver/httpcheckreceiver/go.mod b/receiver/httpcheckreceiver/go.mod index e2c812df445f..fa54c3e258f2 100644 --- a/receiver/httpcheckreceiver/go.mod +++ b/receiver/httpcheckreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpch go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 @@ -50,6 +50,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/httpcheckreceiver/scraper_test.go b/receiver/httpcheckreceiver/scraper_test.go index 0dcde7b7fb51..7757973c65b2 100644 --- a/receiver/httpcheckreceiver/scraper_test.go +++ b/receiver/httpcheckreceiver/scraper_test.go @@ -27,8 +27,8 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/pdata/pmetric" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) func newMockServer(t *testing.T, responseCode int) *httptest.Server { @@ -98,7 +98,7 @@ func TestScaperScrape(t *testing.T) { expectedMetricGen func(t *testing.T) pmetric.Metrics expectedErr error endpoint string - compareOptions []scrapertest.CompareOption + compareOptions []comparetest.CompareOption }{ { desc: "Successful Collection", @@ -110,9 +110,9 @@ func TestScaperScrape(t *testing.T) { return expectedMetrics }, expectedErr: nil, - compareOptions: []scrapertest.CompareOption{ - scrapertest.IgnoreMetricAttributeValue("http.url"), - scrapertest.IgnoreMetricValues("httpcheck.duration"), + compareOptions: []comparetest.CompareOption{ + comparetest.IgnoreMetricAttributeValue("http.url"), + comparetest.IgnoreMetricValues("httpcheck.duration"), }, }, { @@ -125,9 +125,9 @@ func TestScaperScrape(t *testing.T) { return expectedMetrics }, expectedErr: nil, - compareOptions: []scrapertest.CompareOption{ - scrapertest.IgnoreMetricAttributeValue("http.url"), - scrapertest.IgnoreMetricValues("httpcheck.duration"), + compareOptions: []comparetest.CompareOption{ + comparetest.IgnoreMetricAttributeValue("http.url"), + comparetest.IgnoreMetricValues("httpcheck.duration"), }, }, { @@ -140,9 +140,9 @@ func TestScaperScrape(t *testing.T) { return expectedMetrics }, expectedErr: nil, - compareOptions: []scrapertest.CompareOption{ - scrapertest.IgnoreMetricValues("httpcheck.duration"), - scrapertest.IgnoreMetricAttributeValue("error.message"), + compareOptions: []comparetest.CompareOption{ + comparetest.IgnoreMetricValues("httpcheck.duration"), + comparetest.IgnoreMetricAttributeValue("error.message"), }, }, } @@ -169,7 +169,7 @@ func TestScaperScrape(t *testing.T) { expectedMetrics := tc.expectedMetricGen(t) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics, tc.compareOptions...)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics, tc.compareOptions...)) }) } } @@ -178,6 +178,6 @@ func TestNilClient(t *testing.T) { scraper := newScraper(createDefaultConfig().(*Config), componenttest.NewNopReceiverCreateSettings()) actualMetrics, err := scraper.scrape(context.Background()) require.EqualError(t, err, errClientNotInit.Error()) - require.NoError(t, scrapertest.CompareMetrics(pmetric.NewMetrics(), actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(pmetric.NewMetrics(), actualMetrics)) } diff --git a/receiver/iisreceiver/go.mod b/receiver/iisreceiver/go.mod index 078b969e9bba..b9aa90d6f495 100644 --- a/receiver/iisreceiver/go.mod +++ b/receiver/iisreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisrec go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 github.com/stretchr/testify v1.8.1 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -45,6 +45,6 @@ require ( replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters => ../../pkg/winperfcounters -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/iisreceiver/integration_test.go b/receiver/iisreceiver/integration_test.go index bfa0d1bcfdae..776fc59fe3f1 100644 --- a/receiver/iisreceiver/integration_test.go +++ b/receiver/iisreceiver/integration_test.go @@ -27,8 +27,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) func TestIisIntegration(t *testing.T) { @@ -54,7 +54,7 @@ func TestIisIntegration(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics, - scrapertest.IgnoreResourceAttributeValue("iis.application_pool"), - scrapertest.IgnoreMetricValues())) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics, + comparetest.IgnoreResourceAttributeValue("iis.application_pool"), + comparetest.IgnoreMetricValues())) } diff --git a/receiver/iisreceiver/scraper_test.go b/receiver/iisreceiver/scraper_test.go index 955cac04b955..2e1554257b6f 100644 --- a/receiver/iisreceiver/scraper_test.go +++ b/receiver/iisreceiver/scraper_test.go @@ -31,8 +31,8 @@ import ( "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver/internal/metadata" ) @@ -58,7 +58,7 @@ func TestScrape(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } func TestScrapeFailure(t *testing.T) { diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index fb863ca22553..4a79ff8afc60 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/grobie/gomemcache v0.0.0-20180201122607-1f779c573665 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -69,7 +69,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest // see https://github.com/distribution/distribution/issues/3590 exclude github.com/docker/distribution v2.8.0+incompatible diff --git a/receiver/memcachedreceiver/integration_test.go b/receiver/memcachedreceiver/integration_test.go index 55a79d072dd3..5c1ae2f70eaa 100644 --- a/receiver/memcachedreceiver/integration_test.go +++ b/receiver/memcachedreceiver/integration_test.go @@ -31,7 +31,7 @@ import ( "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/pmetric" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" ) func TestIntegration(t *testing.T) { @@ -76,5 +76,5 @@ func TestIntegration(t *testing.T) { expectedMetrics, err := unmarshaller.UnmarshalMetrics(expectedFileBytes) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics, scrapertest.IgnoreMetricValues())) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics, comparetest.IgnoreMetricValues())) } diff --git a/receiver/memcachedreceiver/scraper_test.go b/receiver/memcachedreceiver/scraper_test.go index a4753646e866..70bcfc6f2c40 100644 --- a/receiver/memcachedreceiver/scraper_test.go +++ b/receiver/memcachedreceiver/scraper_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) func TestScraper(t *testing.T) { @@ -42,5 +42,5 @@ func TestScraper(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } diff --git a/receiver/mongodbreceiver/go.mod b/receiver/mongodbreceiver/go.mod index 0f2708ddabb0..758c0c756622 100644 --- a/receiver/mongodbreceiver/go.mod +++ b/receiver/mongodbreceiver/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/hashicorp/go-version v1.6.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.mongodb.org/mongo-driver v1.10.3 @@ -78,6 +78,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/mongodbreceiver/integration_test.go b/receiver/mongodbreceiver/integration_test.go index b872d81c16f3..66dc8b4e39a7 100644 --- a/receiver/mongodbreceiver/integration_test.go +++ b/receiver/mongodbreceiver/integration_test.go @@ -31,8 +31,8 @@ import ( "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/consumer/consumertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) const ( @@ -113,7 +113,7 @@ func TestMongodbIntegration(t *testing.T) { golden.WriteMetrics("actual_metrics.json", actualMetrics) - err = scrapertest.CompareMetrics(expectedMetrics, actualMetrics, scrapertest.IgnoreMetricValues()) + err = comparetest.CompareMetrics(expectedMetrics, actualMetrics, comparetest.IgnoreMetricValues()) require.NoError(t, err) }) t.Run("Running mongodb 4.2", func(t *testing.T) { @@ -149,7 +149,7 @@ func TestMongodbIntegration(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, actualMetrics, scrapertest.IgnoreMetricValues()) + err = comparetest.CompareMetrics(expectedMetrics, actualMetrics, comparetest.IgnoreMetricValues()) require.NoError(t, err) }) t.Run("Running mongodb 4.4 as LPU", func(t *testing.T) { @@ -187,7 +187,7 @@ func TestMongodbIntegration(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, actualMetrics, scrapertest.IgnoreMetricValues()) + err = comparetest.CompareMetrics(expectedMetrics, actualMetrics, comparetest.IgnoreMetricValues()) require.NoError(t, err) }) t.Run("Running mongodb 5.0", func(t *testing.T) { @@ -223,7 +223,7 @@ func TestMongodbIntegration(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics, scrapertest.IgnoreMetricValues())) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics, comparetest.IgnoreMetricValues())) }) } diff --git a/receiver/mongodbreceiver/scraper_test.go b/receiver/mongodbreceiver/scraper_test.go index 7c47b09f36dd..14eee515107d 100644 --- a/receiver/mongodbreceiver/scraper_test.go +++ b/receiver/mongodbreceiver/scraper_test.go @@ -33,8 +33,8 @@ import ( "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) func TestNewMongodbScraper(t *testing.T) { @@ -306,7 +306,7 @@ func TestScraperScrape(t *testing.T) { } expectedMetrics := tc.expectedMetricGen(t) - err = scrapertest.CompareMetrics(expectedMetrics, actualMetrics) + err = comparetest.CompareMetrics(expectedMetrics, actualMetrics) require.NoError(t, err) }) } diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index 15af03de98aa..0472b3ad42fe 100644 --- a/receiver/mysqlreceiver/go.mod +++ b/receiver/mysqlreceiver/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/go-sql-driver/mysql v1.7.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -66,6 +66,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/mysqlreceiver/integration_test.go b/receiver/mysqlreceiver/integration_test.go index eddf46f84ba8..f101b29658e5 100644 --- a/receiver/mysqlreceiver/integration_test.go +++ b/receiver/mysqlreceiver/integration_test.go @@ -30,8 +30,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) func TestMySqlIntegration(t *testing.T) { @@ -66,7 +66,7 @@ func TestMySqlIntegration(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - scrapertest.CompareMetrics(expectedMetrics, actualMetrics, scrapertest.IgnoreMetricValues()) + comparetest.CompareMetrics(expectedMetrics, actualMetrics, comparetest.IgnoreMetricValues()) }) } diff --git a/receiver/mysqlreceiver/scraper_test.go b/receiver/mysqlreceiver/scraper_test.go index a445e325cea3..d56453a09124 100644 --- a/receiver/mysqlreceiver/scraper_test.go +++ b/receiver/mysqlreceiver/scraper_test.go @@ -30,8 +30,8 @@ import ( "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/receiver/scrapererror" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) func TestScrape(t *testing.T) { @@ -85,7 +85,7 @@ func TestScrape(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(actualMetrics, expectedMetrics)) + require.NoError(t, comparetest.CompareMetrics(actualMetrics, expectedMetrics)) }) t.Run("scrape has partial failure", func(t *testing.T) { @@ -115,7 +115,7 @@ func TestScrape(t *testing.T) { expectedFile := filepath.Join("testdata", "scraper", "expected_partial.json") expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - assert.NoError(t, scrapertest.CompareMetrics(actualMetrics, expectedMetrics)) + assert.NoError(t, comparetest.CompareMetrics(actualMetrics, expectedMetrics)) var partialError scrapererror.PartialScrapeError require.True(t, errors.As(scrapeErr, &partialError), "returned error was not PartialScrapeError") diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 620c95fca9a6..dba2799d6454 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201110005315-f5a5f8086c19 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -73,6 +73,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/nginxreceiver/integration_test.go b/receiver/nginxreceiver/integration_test.go index 262f0fd7ce61..9d3313282589 100644 --- a/receiver/nginxreceiver/integration_test.go +++ b/receiver/nginxreceiver/integration_test.go @@ -30,8 +30,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) func nginxContainer(t *testing.T) testcontainers.Container { @@ -86,5 +86,5 @@ func TestNginxIntegration(t *testing.T) { actualMetrics := consumer.AllMetrics()[0] - scrapertest.CompareMetrics(expectedMetrics, actualMetrics, scrapertest.IgnoreMetricValues()) + comparetest.CompareMetrics(expectedMetrics, actualMetrics, comparetest.IgnoreMetricValues()) } diff --git a/receiver/nginxreceiver/scraper_test.go b/receiver/nginxreceiver/scraper_test.go index 3a30e851d40c..531ee6d6b7c8 100644 --- a/receiver/nginxreceiver/scraper_test.go +++ b/receiver/nginxreceiver/scraper_test.go @@ -28,8 +28,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtls" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) func TestScraper(t *testing.T) { @@ -50,7 +50,7 @@ func TestScraper(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } func TestScraperError(t *testing.T) { diff --git a/receiver/nsxtreceiver/go.mod b/receiver/nsxtreceiver/go.mod index 66e33a068810..5d45a213e98d 100644 --- a/receiver/nsxtreceiver/go.mod +++ b/receiver/nsxtreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtre go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/vmware/go-vmware-nsxt v0.0.0-20220328155605-f49a14c1ef5f go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -51,6 +51,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/nsxtreceiver/scraper_test.go b/receiver/nsxtreceiver/scraper_test.go index ae6a2ba741af..67c854e8882e 100644 --- a/receiver/nsxtreceiver/scraper_test.go +++ b/receiver/nsxtreceiver/scraper_test.go @@ -28,8 +28,8 @@ import ( "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/pdata/pcommon" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver/internal/metadata" dm "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nsxtreceiver/internal/model" ) @@ -70,7 +70,7 @@ func TestScrape(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(filepath.Join("testdata", "metrics", "expected_metrics.json")) require.NoError(t, err) - err = scrapertest.CompareMetrics(metrics, expectedMetrics) + err = comparetest.CompareMetrics(metrics, expectedMetrics) require.NoError(t, err) } diff --git a/receiver/postgresqlreceiver/go.mod b/receiver/postgresqlreceiver/go.mod index 721aab8cb918..6c57404ed9a3 100644 --- a/receiver/postgresqlreceiver/go.mod +++ b/receiver/postgresqlreceiver/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/lib/pq v1.10.7 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -67,6 +67,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/postgresqlreceiver/integration_test.go b/receiver/postgresqlreceiver/integration_test.go index 03ea72e481ea..b11d4f9adaa8 100644 --- a/receiver/postgresqlreceiver/integration_test.go +++ b/receiver/postgresqlreceiver/integration_test.go @@ -31,8 +31,8 @@ import ( "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/featuregate" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) type configFunc func(hostname string) *Config @@ -153,10 +153,10 @@ func TestPostgreSQLIntegration(t *testing.T) { actualMetrics := consumer.AllMetrics()[0] - require.NoError(t, scrapertest.CompareMetrics( + require.NoError(t, comparetest.CompareMetrics( expectedMetrics, actualMetrics, - scrapertest.IgnoreMetricValues(), - scrapertest.IgnoreSubsequentDataPoints("postgresql.backends"), + comparetest.IgnoreMetricValues(), + comparetest.IgnoreSubsequentDataPoints("postgresql.backends"), )) }) } diff --git a/receiver/postgresqlreceiver/scraper_test.go b/receiver/postgresqlreceiver/scraper_test.go index 4d0bebbdbe98..88ae36a0b75f 100644 --- a/receiver/postgresqlreceiver/scraper_test.go +++ b/receiver/postgresqlreceiver/scraper_test.go @@ -25,8 +25,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pmetric" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) func TestUnsuccessfulScrape(t *testing.T) { @@ -41,7 +41,7 @@ func TestUnsuccessfulScrape(t *testing.T) { actualMetrics, err := scraper.scrape(context.Background()) require.Error(t, err) - require.NoError(t, scrapertest.CompareMetrics(pmetric.NewMetrics(), actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(pmetric.NewMetrics(), actualMetrics)) } func TestScraper(t *testing.T) { @@ -61,7 +61,7 @@ func TestScraper(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } func TestScraperNoDatabaseSingle(t *testing.T) { @@ -80,7 +80,7 @@ func TestScraperNoDatabaseSingle(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } func TestScraperNoDatabaseMultiple(t *testing.T) { @@ -99,7 +99,7 @@ func TestScraperNoDatabaseMultiple(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } func TestScraperWithResourceAttributeFeatureGate(t *testing.T) { @@ -116,7 +116,7 @@ func TestScraperWithResourceAttributeFeatureGate(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } func TestScraperWithResourceAttributeFeatureGateSingle(t *testing.T) { @@ -133,7 +133,7 @@ func TestScraperWithResourceAttributeFeatureGateSingle(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } type mockClientFactory struct{ mock.Mock } diff --git a/receiver/rabbitmqreceiver/go.mod b/receiver/rabbitmqreceiver/go.mod index 3a60c640858f..02200b671ca2 100644 --- a/receiver/rabbitmqreceiver/go.mod +++ b/receiver/rabbitmqreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbit go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -73,6 +73,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/rabbitmqreceiver/integration_test.go b/receiver/rabbitmqreceiver/integration_test.go index c59fe46215f2..67f12b3f6701 100644 --- a/receiver/rabbitmqreceiver/integration_test.go +++ b/receiver/rabbitmqreceiver/integration_test.go @@ -34,8 +34,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) var ( @@ -85,7 +85,7 @@ func TestRabbitmqIntegration(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - scrapertest.CompareMetrics(expectedMetrics, actualMetrics, scrapertest.IgnoreMetricValues()) + comparetest.CompareMetrics(expectedMetrics, actualMetrics, comparetest.IgnoreMetricValues()) }) } diff --git a/receiver/rabbitmqreceiver/scraper_test.go b/receiver/rabbitmqreceiver/scraper_test.go index f70afe711174..8cb050281fab 100644 --- a/receiver/rabbitmqreceiver/scraper_test.go +++ b/receiver/rabbitmqreceiver/scraper_test.go @@ -29,8 +29,8 @@ import ( "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver/internal/mocks" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver/internal/models" ) @@ -152,7 +152,7 @@ func TestScaperScrape(t *testing.T) { expectedMetrics := tc.expectedMetricGen(t) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) }) } } diff --git a/receiver/riakreceiver/go.mod b/receiver/riakreceiver/go.mod index b9c74c4b7534..0c12e19459e5 100644 --- a/receiver/riakreceiver/go.mod +++ b/receiver/riakreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakre go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -73,6 +73,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/riakreceiver/integration_test.go b/receiver/riakreceiver/integration_test.go index 16f0365e1933..e841c624e011 100644 --- a/receiver/riakreceiver/integration_test.go +++ b/receiver/riakreceiver/integration_test.go @@ -31,8 +31,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer/consumertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) func riakContainer(t *testing.T) testcontainers.Container { @@ -86,5 +86,5 @@ func TestRiakIntegration(t *testing.T) { actualMetrics := consumer.AllMetrics()[0] - scrapertest.CompareMetrics(expectedMetrics, actualMetrics, scrapertest.IgnoreMetricValues()) + comparetest.CompareMetrics(expectedMetrics, actualMetrics, comparetest.IgnoreMetricValues()) } diff --git a/receiver/riakreceiver/scraper_test.go b/receiver/riakreceiver/scraper_test.go index 0c919e555c38..5d1cc6ed2464 100644 --- a/receiver/riakreceiver/scraper_test.go +++ b/receiver/riakreceiver/scraper_test.go @@ -29,8 +29,8 @@ import ( "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver/internal/metadata" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver/internal/mocks" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/riakreceiver/internal/model" @@ -207,7 +207,7 @@ func TestScaperScrape(t *testing.T) { expectedMetrics := tc.expectedMetricGen(t) - err = scrapertest.CompareMetrics(expectedMetrics, actualMetrics) + err = comparetest.CompareMetrics(expectedMetrics, actualMetrics) require.NoError(t, err) }) } diff --git a/receiver/saphanareceiver/go.mod b/receiver/saphanareceiver/go.mod index a0dd02d6c66f..188f072b0c8f 100644 --- a/receiver/saphanareceiver/go.mod +++ b/receiver/saphanareceiver/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/SAP/go-hdb v0.111.5 github.com/google/go-cmp v0.5.9 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70 @@ -50,6 +50,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/saphanareceiver/scraper_test.go b/receiver/saphanareceiver/scraper_test.go index a7d77f4144cf..591f6b570794 100644 --- a/receiver/saphanareceiver/scraper_test.go +++ b/receiver/saphanareceiver/scraper_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) const fullExpectedMetricsPath = "./testdata/expected_metrics/full.json" @@ -47,7 +47,7 @@ func TestScraper(t *testing.T) { actualMetrics, err := sc.Scrape(context.Background()) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } func TestDisabledMetrics(t *testing.T) { @@ -112,7 +112,7 @@ func TestDisabledMetrics(t *testing.T) { actualMetrics, err := sc.Scrape(context.Background()) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) } type queryJSON struct { diff --git a/receiver/snmpreceiver/go.mod b/receiver/snmpreceiver/go.mod index 9a5f73962e61..323254bed8b0 100644 --- a/receiver/snmpreceiver/go.mod +++ b/receiver/snmpreceiver/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/gosnmp/gosnmp v1.35.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -96,6 +96,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/snmpreceiver/integration_test.go b/receiver/snmpreceiver/integration_test.go index 7552fd68bbcb..91f0cd818b04 100644 --- a/receiver/snmpreceiver/integration_test.go +++ b/receiver/snmpreceiver/integration_test.go @@ -30,8 +30,8 @@ import ( "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/service/servicetest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) func TestSnmpReceiverIntegration(t *testing.T) { @@ -84,7 +84,7 @@ func TestSnmpReceiverIntegration(t *testing.T) { expectedFile := filepath.Join("testdata", "integration", testCase.expectedResultsFilename) expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, actualMetrics) + err = comparetest.CompareMetrics(expectedMetrics, actualMetrics) require.NoError(t, err) }) } diff --git a/receiver/snmpreceiver/scraper_test.go b/receiver/snmpreceiver/scraper_test.go index 4fb8b02fc950..08bf9d93d368 100644 --- a/receiver/snmpreceiver/scraper_test.go +++ b/receiver/snmpreceiver/scraper_test.go @@ -28,8 +28,8 @@ import ( "go.opentelemetry.io/collector/receiver/scrapererror" "go.uber.org/zap" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" ) type MockClient struct { @@ -264,7 +264,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -311,7 +311,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -360,7 +360,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -409,7 +409,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -473,7 +473,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -539,7 +539,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -611,7 +611,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -757,7 +757,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -821,7 +821,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -887,7 +887,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -953,7 +953,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -1035,7 +1035,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -1128,7 +1128,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -1219,7 +1219,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -1451,7 +1451,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -1528,7 +1528,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -1605,7 +1605,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -1682,7 +1682,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -1767,7 +1767,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -2012,7 +2012,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -2110,7 +2110,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, @@ -2186,7 +2186,7 @@ func TestScrape(t *testing.T) { expectedMetrics := expectedMetricGen(t) metrics, err := scraper.scrape(context.Background()) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) }, }, diff --git a/receiver/sqlqueryreceiver/go.mod b/receiver/sqlqueryreceiver/go.mod index 07bc4ac49c25..19a616e65dc9 100644 --- a/receiver/sqlqueryreceiver/go.mod +++ b/receiver/sqlqueryreceiver/go.mod @@ -112,6 +112,6 @@ require ( // see https://github.com/mattn/go-ieproxy/issues/45 replace github.com/mattn/go-ieproxy => github.com/mattn/go-ieproxy v0.0.1 -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/sqlserverreceiver/go.mod b/receiver/sqlserverreceiver/go.mod index bf8b840a10d7..6279c1ec41a8 100644 --- a/receiver/sqlserverreceiver/go.mod +++ b/receiver/sqlserverreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlser go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 github.com/stretchr/testify v1.8.1 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -48,7 +48,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters => ../../pkg/winperfcounters diff --git a/receiver/sqlserverreceiver/scraper_test.go b/receiver/sqlserverreceiver/scraper_test.go index 91b8a83acadd..3f6b6b9f3c3a 100644 --- a/receiver/sqlserverreceiver/scraper_test.go +++ b/receiver/sqlserverreceiver/scraper_test.go @@ -29,8 +29,8 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters" ) @@ -145,6 +145,6 @@ func TestScrape(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(goldenScrapePath) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, scrapeData) + err = comparetest.CompareMetrics(expectedMetrics, scrapeData) require.NoError(t, err) } diff --git a/receiver/vcenterreceiver/go.mod b/receiver/vcenterreceiver/go.mod index 5d8e836fac51..4e899413857f 100644 --- a/receiver/vcenterreceiver/go.mod +++ b/receiver/vcenterreceiver/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/basgys/goxml2json v1.1.0 github.com/google/go-cmp v0.5.9 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/vmware/govmomi v0.29.0 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -50,6 +50,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest retract v0.65.0 diff --git a/receiver/vcenterreceiver/integration_test.go b/receiver/vcenterreceiver/integration_test.go index f81da19bb813..99c8d3f304e0 100644 --- a/receiver/vcenterreceiver/integration_test.go +++ b/receiver/vcenterreceiver/integration_test.go @@ -32,8 +32,8 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.uber.org/zap" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver/internal/metadata" ) @@ -76,7 +76,7 @@ func TestEndtoEnd_ESX(t *testing.T) { goldenPath := filepath.Join("testdata", "metrics", "integration-metrics.json") expectedMetrics, err := golden.ReadMetrics(goldenPath) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, metrics, scrapertest.IgnoreMetricValues())) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, metrics, comparetest.IgnoreMetricValues())) err = scraper.Shutdown(ctx) require.NoError(t, err) diff --git a/receiver/vcenterreceiver/scraper_test.go b/receiver/vcenterreceiver/scraper_test.go index 6c3e99308efd..f0d7e716e890 100644 --- a/receiver/vcenterreceiver/scraper_test.go +++ b/receiver/vcenterreceiver/scraper_test.go @@ -23,8 +23,8 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.uber.org/zap" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver/internal/metadata" mock "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver/internal/mockserver" ) @@ -71,7 +71,7 @@ func testScrape(ctx context.Context, t *testing.T, cfg *Config) { expectedMetrics, err := golden.ReadMetrics(goldenPath) require.NoError(t, err) - err = scrapertest.CompareMetrics(expectedMetrics, metrics) + err = comparetest.CompareMetrics(expectedMetrics, metrics) require.NoError(t, err) require.NoError(t, scraper.Shutdown(ctx)) } diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index f9a9440e9a06..dbea1a77393f 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/window go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.66.0 github.com/stretchr/testify v1.8.1 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -45,7 +45,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters => ../../pkg/winperfcounters diff --git a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go index f3da1e5c258c..f8db0923def2 100644 --- a/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go +++ b/receiver/windowsperfcountersreceiver/windowsperfcounters_scraper_test.go @@ -33,8 +33,8 @@ import ( "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest/observer" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters" ) @@ -187,7 +187,7 @@ func Test_WindowsPerfCounterScraper(t *testing.T) { require.NoError(t, err) expectedMetrics, err := golden.ReadMetrics(test.expectedMetricPath) - scrapertest.CompareMetrics(expectedMetrics, actualMetrics, scrapertest.IgnoreMetricValues()) + comparetest.CompareMetrics(expectedMetrics, actualMetrics, comparetest.IgnoreMetricValues()) require.NoError(t, err) }) } diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index ed55a089f34a..5a1027ce1ae3 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest v0.66.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.66.0 github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.15.0 go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70 @@ -71,7 +71,7 @@ require ( replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest => ../../internal/scrapertest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest // see https://github.com/distribution/distribution/issues/3590 exclude github.com/docker/distribution v2.8.0+incompatible diff --git a/receiver/zookeeperreceiver/scraper_test.go b/receiver/zookeeperreceiver/scraper_test.go index 639055bf138f..1d4f97286008 100644 --- a/receiver/zookeeperreceiver/scraper_test.go +++ b/receiver/zookeeperreceiver/scraper_test.go @@ -34,8 +34,8 @@ import ( "go.uber.org/zap/zaptest/observer" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest" - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest/golden" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest/golden" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver/internal/metadata" ) @@ -270,7 +270,7 @@ func TestZookeeperMetricsScraperScrape(t *testing.T) { expectedMetrics, err := golden.ReadMetrics(expectedFile) require.NoError(t, err) - require.NoError(t, scrapertest.CompareMetrics(expectedMetrics, actualMetrics)) + require.NoError(t, comparetest.CompareMetrics(expectedMetrics, actualMetrics)) }) } } diff --git a/versions.yaml b/versions.yaml index bc4e739142f7..53ec500b8700 100644 --- a/versions.yaml +++ b/versions.yaml @@ -103,7 +103,7 @@ module-sets: - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet - github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders - - github.com/open-telemetry/opentelemetry-collector-contrib/internal/scrapertest + - github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr