From ba3d660762640824c3ed687b42901df35acb02bd Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Wed, 31 Jan 2024 09:36:23 -0800 Subject: [PATCH] [testbed] Deprecate testbed.GetAvailablePort (#30811) **Description:** Deprecate testbed.GetAvailablePort in favor of testutil.GetAvailablePort Move healthcheckextension to use testutil.GetAvailablePort --- .../deprecate_testbed_GetAvailablePort.yaml | 27 +++ cmd/configschema/go.mod | 6 - cmd/otelcontribcol/builder-config.yaml | 14 +- cmd/otelcontribcol/go.mod | 4 - extension/healthcheckextension/go.mod | 157 +-------------- extension/healthcheckextension/go.sum | 186 +----------------- .../healthcheckextension/integration_test.go | 4 +- go.mod | 6 - internal/common/testutil/testutil.go | 12 ++ testbed/README.md | 4 +- .../traces/correctness_test.go | 5 +- testbed/correctnesstests/utils.go | 27 +-- testbed/stabilitytests/metric_test.go | 17 +- testbed/stabilitytests/trace_test.go | 21 +- testbed/testbed/utils.go | 1 + testbed/tests/e2e_test.go | 9 +- testbed/tests/log_test.go | 49 ++--- testbed/tests/metric_test.go | 25 +-- testbed/tests/resource_processor_test.go | 5 +- testbed/tests/scenarios.go | 5 +- testbed/tests/syslog_integration_test.go | 5 +- testbed/tests/trace_test.go | 57 +++--- 22 files changed, 170 insertions(+), 476 deletions(-) create mode 100755 .chloggen/deprecate_testbed_GetAvailablePort.yaml diff --git a/.chloggen/deprecate_testbed_GetAvailablePort.yaml b/.chloggen/deprecate_testbed_GetAvailablePort.yaml new file mode 100755 index 0000000000000..fc5cc9e21ab3a --- /dev/null +++ b/.chloggen/deprecate_testbed_GetAvailablePort.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: testbed + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Deprecate testbed.GetAvailablePort in favor of testutil.GetAvailablePort + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [30811] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: Move healthcheckextension to use testutil.GetAvailablePort + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [api] diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 29316cc4dd34f..7872f24673df6 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -1150,9 +1150,3 @@ replace ( github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector => ../../connector/servicegraphconnector github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector => ../../connector/spanmetricsconnector ) - -replace github.com/open-telemetry/opentelemetry-collector-contrib/testbed/mockdatasenders/mockdatadogagentexporter => ../../testbed/mockdatasenders/mockdatadogagentexporter - -replace github.com/open-telemetry/opentelemetry-collector-contrib/testbed => ../../testbed - -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter => ../../exporter/syslogexporter diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index a110c06f79972..146195c857805 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -44,9 +44,9 @@ extensions: import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240125183026-3cacd40b27e8 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240129215828-1ed45ec12569 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240129215828-1ed45ec12569 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240129215828-1ed45ec12569 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.93.0 @@ -94,8 +94,8 @@ exporters: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.93.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240129215828-1ed45ec12569 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240129215828-1ed45ec12569 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/datadogprocessor v0.93.0 @@ -121,7 +121,7 @@ processors: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.93.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240129215828-1ed45ec12569 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.93.0 @@ -452,6 +452,4 @@ replaces: - github.com/open-telemetry/opentelemetry-collector-contrib/extension/remotetapextension => ../../extension/remotetapextension - github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampextension => ../../extension/opampextension - github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension => ../../extension/solarwindsapmsettingsextension - - github.com/open-telemetry/opentelemetry-collector-contrib/testbed/mockdatasenders/mockdatadogagentexporter => ../../testbed/mockdatasenders/mockdatadogagentexporter - - github.com/open-telemetry/opentelemetry-collector-contrib/testbed => ../../testbed - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/namedpipereceiver => ../../receiver/namedpipereceiver diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 1edd45e8a4faf..061c83ff98489 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -1190,8 +1190,4 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/opam replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension => ../../extension/solarwindsapmsettingsextension -replace github.com/open-telemetry/opentelemetry-collector-contrib/testbed/mockdatasenders/mockdatadogagentexporter => ../../testbed/mockdatasenders/mockdatadogagentexporter - -replace github.com/open-telemetry/opentelemetry-collector-contrib/testbed => ../../testbed - replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/namedpipereceiver => ../../receiver/namedpipereceiver diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index 011bdc9d25977..3951983c5c33b 100644 --- a/extension/healthcheckextension/go.mod +++ b/extension/healthcheckextension/go.mod @@ -4,7 +4,6 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 - github.com/open-telemetry/opentelemetry-collector-contrib/testbed v0.93.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f @@ -19,129 +18,51 @@ require ( ) require ( - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect - github.com/apache/thrift v0.19.0 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/cenkalti/backoff/v4 v4.2.1 // indirect - github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/expr-lang/expr v1.16.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-ole/go-ole v1.2.6 // indirect - github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect - github.com/google/uuid v1.5.0 // indirect - github.com/gorilla/mux v1.8.1 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect github.com/hashicorp/go-version v1.6.0 // indirect - github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect - github.com/jaegertracing/jaeger v1.53.0 // indirect - github.com/jpillora/backoff v1.0.0 // indirect - github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.5 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect - github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165 // indirect - github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/mostynb/go-grpc-compression v1.2.2 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.93.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.93.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.93.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.93.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.93.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.93.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.93.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.93.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.93.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.93.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.93.0 // indirect - github.com/openzipkin/zipkin-go v0.4.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/prometheus/client_golang v1.18.0 // indirect github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/rs/cors v1.10.1 // indirect - github.com/shirou/gopsutil/v3 v3.23.12 // indirect - github.com/shoenig/go-m1cpu v0.1.6 // indirect - github.com/soheilhy/cmux v0.1.5 // indirect - github.com/spf13/cobra v1.8.0 // indirect - github.com/spf13/pflag v1.0.5 // indirect - github.com/tklauser/go-sysconf v0.3.12 // indirect - github.com/tklauser/numcpus v0.6.1 // indirect - github.com/valyala/fastjson v1.6.4 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f // indirect go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f // indirect go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f // indirect go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/contrib/config v0.2.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect - go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect - go.opentelemetry.io/contrib/zpages v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect - go.opentelemetry.io/otel/bridge/opencensus v0.45.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.45.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.45.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.22.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect - go.opentelemetry.io/proto/otlp v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.20.0 // indirect golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect google.golang.org/grpc v1.61.0 // indirect google.golang.org/protobuf v1.32.0 // indirect @@ -155,79 +76,3 @@ retract ( v0.76.1 v0.65.0 ) - -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver => ../../receiver/carbonreceiver - -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter => ../../exporter/sapmexporter - -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver => ../../receiver/opencensusreceiver - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => ../../pkg/resourcetotelemetry - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata => ../../pkg/experimentalmetricmetadata - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => ../../pkg/translator/prometheus - -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver => ../../receiver/splunkhecreceiver - -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter => ../../exporter/splunkhecexporter - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ../../pkg/translator/opencensus - -replace github.com/open-telemetry/opentelemetry-collector-contrib/testbed => ../../testbed - -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter => ../../exporter/prometheusexporter - -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter => ../../exporter/opencensusexporter - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx => ../../pkg/translator/signalfx - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr => ../../pkg/batchperresourceattr - -replace github.com/open-telemetry/opentelemetry-collector-contrib/testbed/mockdatasenders/mockdatadogagentexporter => ../../testbed/mockdatasenders/mockdatadogagentexporter - -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver => ../../receiver/signalfxreceiver - -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver => ../../receiver/syslogreceiver - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => ../../pkg/stanza - -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent => ../../internal/sharedcomponent - -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => ../../internal/splunk - -replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => ../storage - -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal - -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver => ../../receiver/sapmreceiver - -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter => ../../exporter/signalfxexporter - -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver => ../../receiver/zipkinreceiver - -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver => ../../receiver/jaegerreceiver - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger => ../../pkg/translator/jaeger - -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver => ../../receiver/datadogreceiver - -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter => ../../exporter/carbonexporter - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite => ../../pkg/translator/prometheusremotewrite - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil - -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter => ../../exporter/syslogexporter - -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter => ../../exporter/zipkinexporter - -replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => ../../receiver/prometheusreceiver - -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter => ../../exporter/prometheusremotewriteexporter - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin => ../../pkg/translator/zipkin - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden diff --git a/extension/healthcheckextension/go.sum b/extension/healthcheckextension/go.sum index 7371e4d708517..fc60584845ed1 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -1,26 +1,12 @@ -cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 h1:aRVqY1p2IJaBGStWMsQMpkAa83cPkCDLl80eOj0Rbz4= -cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68/go.mod h1:1a3eRNYX12fs5UABBIXS8HXVvQbX9hRB/RkEBPORpe8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= -github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= -github.com/apache/thrift v0.19.0 h1:sOqkWPzMj7w6XaYbJQG7m4sGqVolaW/0D28Ln7yPzMk= -github.com/apache/thrift v0.19.0/go.mod h1:SUALL216IiaOw2Oy+5Vs9lboJ/t9g40C+G07Dc0QC1I= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= -github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= -github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/xds/go v0.0.0-20231109132714-523115ebc101 h1:7To3pQ+pZo0i3dsWEbinPNFs5gPSBOsJtx3wTT94VBY= -github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -29,23 +15,15 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= -github.com/expr-lang/expr v1.16.0 h1:BQabx+PbjsL2PEQwkJ4GIn3CcuUh8flduHhJ0lHjWwE= -github.com/expr-lang/expr v1.16.0/go.mod h1:uCkhfG+x7fcZ5A5sXHKuQ07jGZRl6J0FCAaf2k4PtVQ= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/go-kit/kit v0.13.0 h1:OoneCcHKHQ03LfBpoQCUfCluwd2Vt3ohz+kvbJneZAU= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= -github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0= -github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -74,33 +52,11 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= -github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= -github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= -github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= -github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 h1:/c3QmbOGMGTOumP2iT/rCwB7b0QDGLKzqOmktBjT+Is= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1/go.mod h1:5SN9VR2LTsRFsrEC6FHgRbTWrTHu6tqPeKxEQv15giM= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= -github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= -github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 h1:2r2WiFeAwiJ/uyx1qIKnV1L4C9w/2V8ehlbJY4gjFaM= -github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4/go.mod h1:1yEQhaLb/cETXCqQmdh7lDjupNAReO7c83AHyK2dJ48= -github.com/jaegertracing/jaeger v1.53.0 h1:C/7UgUTBpQFRS5+cOb6kYIHVqjWNw8p5PAiSKfZbP2I= -github.com/jaegertracing/jaeger v1.53.0/go.mod h1:bs6/Yr0miegvoyKhWdCzFmMnAcER6Ih6IkZ65AzVYfk= -github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= @@ -113,34 +69,17 @@ github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g= github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLNvY1Dus= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165 h1:bCiVCRCs1Heq84lurVinUPy19keqGEe4jh5vtK37jcg= -github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165/go.mod h1:WZxr2/6a/Ar9bMDc2rN/LJrE/hF6bXE4LPyDSIxwAfg= -github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= -github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c h1:VtwQ41oftZwlMnOEbMWQtSEUgU64U4s+GHk7hZK+jtY= -github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c/go.mod h1:JKx41uQRwqlTZabZc+kILPrO/3jlKnQ2Z8b7YiVw5cE= -github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE= github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mostynb/go-grpc-compression v1.2.2 h1:XaDbnRvt2+1vgr0b/l0qh4mJAfIxE0bKXtz2Znl3GGI= -github.com/mostynb/go-grpc-compression v1.2.2/go.mod h1:GOCr2KBxXcblCuczg3YdLQlcin1/NfyDA348ckuCH6w= -github.com/openzipkin/zipkin-go v0.4.2 h1:zjqfqHjUpPmB3c1GlCvvgsM1G4LkvqQbBDueDOCg/jA= -github.com/openzipkin/zipkin-go v0.4.2/go.mod h1:ZeVkFjuuBiSy13y8vpSDCjMi9GoI3hPpCJSBx/EYFhY= -github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= -github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI= -github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -151,50 +90,19 @@ github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1B github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= -github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= -github.com/shirou/gopsutil/v3 v3.23.12 h1:z90NtUkp3bMtmICZKpC4+WaknU1eXtp5vtbQ11DgpE4= -github.com/shirou/gopsutil/v3 v3.23.12/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= -github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= -github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= -github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= -github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= -github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= -github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= -github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= -github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= -github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= -github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= -github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= -github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= -github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= -github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= -github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= -github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ= -github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= @@ -205,16 +113,10 @@ go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388ad go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= @@ -223,76 +125,22 @@ go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addc go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f h1:sRJMb9Lw4ywwg0bZPZCneiZRRz3u4HLOUSElZMMMLtU= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f h1:KMACbjhaJE4XRkYs4I9RSE5eaj5j3rFg+5Oox+aQjIc= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f h1:N8o/7yGU4aKl6bN98zCYtYFtB7VLEcvEUQq3lCEB9/M= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f h1:YZi/DSIbL/7igtiHesuJTe34T+FdipjGRoDx4ITlkcM= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f h1:Y4qpdSiDFA9aLDtwsSks/K/mrdFtf83M8DUqT4Oy9Ac= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= -go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= -go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= -go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= -go.opentelemetry.io/contrib/propagators/b3 v1.22.0/go.mod h1:N3z0ycFRhsVZ+tG/uavMxHvOvFE95QM6gwW1zSqT9dQ= -go.opentelemetry.io/contrib/zpages v0.47.0 h1:ekpdNa2wqOvAfwZIGDIIV02zmR+z08aWPt21KrPJnaU= -go.opentelemetry.io/contrib/zpages v0.47.0/go.mod h1:rBeFA/UxnMjRlEGpmClIqzf1mCIKtl7ahjww3wsSdGs= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= -go.opentelemetry.io/otel/bridge/opencensus v0.45.0 h1:kEOlv9Exuv3J8GCf1nLMHfrTPGnZOuIkN8YlRM14TtQ= -go.opentelemetry.io/otel/bridge/opencensus v0.45.0/go.mod h1:tkVMJeFOr43+zzwbxtIWsNcCCDT7rI5/c9rhMfMIENg= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0 h1:tfil6di0PoNV7FZdsCS7A5izZoVVQ7AuXtyekbOpG/I= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0/go.mod h1:AKFZIEPOnqB00P63bTjOiah4ZTaRzl1TKwUWpZdYUHI= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.45.0 h1:+RbSCde0ERway5FwKvXR3aRJIFeDu9rtwC6E7BC6uoM= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.45.0/go.mod h1:zcI8u2EJxbLPyoZ3SkVAAcQPgYb1TDRzW93xLFnsggU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 h1:9M3+rhx7kZCIQQhQRYaZCdNu1V73tm4TvXs2ntl98C4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0/go.mod h1:noq80iT8rrHP1SfybmPiRGc9dc5M8RPmGvtwo7Oo7tc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0 h1:H2JFgRcGiyHg7H7bwcwaQJYrNFqCqrbTQ8K4p1OvDu8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0/go.mod h1:WfCWp1bGoYK8MeULtI15MmQVczfR+bFkk0DF3h06QmQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCyI9jVEfqhUh2MoSkmolPjfh5fp2hnV0b0irxH4Q= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= go.opentelemetry.io/otel/exporters/prometheus v0.45.0/go.mod h1:UVJZPLnfDSvHj+eJuZE+E1GjIBD267mEMfAAHJdghWg= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.45.0 h1:NjN6zc7Mwy9torqa3mo+pMJ3mHoPI0uzVSYcqB2t72A= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.45.0/go.mod h1:U+T5v2bk4fCC8XdSEWZja3Pm/ZhvV/zE7JwX/ELJKts= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.22.0 h1:zr8ymM5OWWjjiWRzwTfZ67c905+2TMHYp2lMJ52QTyM= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.22.0/go.mod h1:sQs7FT2iLVJ+67vYngGJkPe1qr39IzaBzaj9IDNNY8k= go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY= go.opentelemetry.io/otel/sdk v1.22.0 h1:6coWHw9xw7EfClIC/+O31R8IY3/+EiRFHevmHafB2Gw= @@ -301,8 +149,6 @@ go.opentelemetry.io/otel/sdk/metric v1.22.0 h1:ARrRetm1HCVxq0cbnaZQlfwODYJHo3gFL go.opentelemetry.io/otel/sdk/metric v1.22.0/go.mod h1:KjQGeMIDlBNEOo6HvjhxIec1p/69/kULDcp4gr0oLQQ= go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo= -go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= -go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -312,15 +158,12 @@ go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20231127185646-65229373498e h1:Gvh4YaCaXNs6dKTlfgismwWZKyjVZXwOPfIyUaqU3No= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -330,40 +173,22 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -374,22 +199,15 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac h1:ZL/Teoy/ZGnzyrqK/Optxxp2pmVh+fmJ97slxSRyzUg= -google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe h1:0poefMBYvYbs7g5UkjS6HcxBPaTRAmznle9jnxYoAI8= -google.golang.org/genproto/googleapis/api v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe h1:bQnxqljG/wqi4NTXu2+DJ3n7APcEA882QZ1JvhQAq9o= google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -414,8 +232,6 @@ google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7 google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/extension/healthcheckextension/integration_test.go b/extension/healthcheckextension/integration_test.go index 76c96022d9956..83df1ced79681 100644 --- a/extension/healthcheckextension/integration_test.go +++ b/extension/healthcheckextension/integration_test.go @@ -16,12 +16,12 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/extension/extensiontest" - "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" ) func Test_SimpleHealthCheck(t *testing.T) { f := NewFactory() - port := testbed.GetAvailablePort(t) + port := testutil.GetAvailablePort(t) cfg := f.CreateDefaultConfig().(*Config) cfg.Endpoint = fmt.Sprintf("localhost:%d", port) e, err := f.CreateExtension(context.Background(), extensiontest.NewNopCreateSettings(), cfg) diff --git a/go.mod b/go.mod index 69c9beed696d0..5bb2a9ed7d207 100644 --- a/go.mod +++ b/go.mod @@ -1151,9 +1151,3 @@ replace ( github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector => ./connector/servicegraphconnector github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector => ./connector/spanmetricsconnector ) - -replace github.com/open-telemetry/opentelemetry-collector-contrib/testbed/mockdatasenders/mockdatadogagentexporter => ./testbed/mockdatasenders/mockdatadogagentexporter - -replace github.com/open-telemetry/opentelemetry-collector-contrib/testbed => ./testbed - -replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter => ./exporter/syslogexporter diff --git a/internal/common/testutil/testutil.go b/internal/common/testutil/testutil.go index a6437bba3942d..1f958995d5304 100644 --- a/internal/common/testutil/testutil.go +++ b/internal/common/testutil/testutil.go @@ -7,6 +7,7 @@ import ( "net" "os/exec" "runtime" + "strconv" "strings" "testing" @@ -133,3 +134,14 @@ func SetFeatureGateForTest(t testing.TB, gate *featuregate.Gate, enabled bool) f require.NoError(t, featuregate.GlobalRegistry().Set(gate.ID(), originalValue)) } } + +func GetAvailablePort(t testing.TB) int { + endpoint := GetAvailableLocalAddress(t) + _, port, err := net.SplitHostPort(endpoint) + require.NoError(t, err) + + portInt, err := strconv.Atoi(port) + require.NoError(t, err) + + return portInt +} diff --git a/testbed/README.md b/testbed/README.md index ff9b424dcb0f0..099c796e9efe4 100644 --- a/testbed/README.md +++ b/testbed/README.md @@ -76,8 +76,8 @@ Generally, when designing a test for new exporter and receiver components, devel }{ { "NewExporterOrReceiver", - testbed.NewXXXDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - testbed.NewXXXDataReceiver(testbed.GetAvailablePort(t)), + testbed.NewXXXDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + testbed.NewXXXDataReceiver(testutil.GetAvailablePort(t)), testbed.ResourceSpec{ ExpectedMaxCPU: XX, ExpectedMaxRAM: XX, diff --git a/testbed/correctnesstests/traces/correctness_test.go b/testbed/correctnesstests/traces/correctness_test.go index 4c246ad1ff1c9..6dd5d14862352 100644 --- a/testbed/correctnesstests/traces/correctness_test.go +++ b/testbed/correctnesstests/traces/correctness_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/correctnesstests" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" ) @@ -113,8 +114,8 @@ func TestSporadicGoldenDataset(t *testing.T) { "../../../internal/coreinternal/goldendataset/testdata/generated_pict_pairs_traces.txt", "../../../internal/coreinternal/goldendataset/testdata/generated_pict_pairs_spans.txt", "") - sender := testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)) - receiver := testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)) + sender := testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)) + receiver := testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)) receiver.WithRetry(` retry_on_failure: enabled: false diff --git a/testbed/correctnesstests/utils.go b/testbed/correctnesstests/utils.go index 9df72cb89a1b5..f84f803b10178 100644 --- a/testbed/correctnesstests/utils.go +++ b/testbed/correctnesstests/utils.go @@ -11,6 +11,7 @@ import ( "strings" "testing" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datareceivers" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datasenders" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" @@ -68,7 +69,7 @@ service: sender.GenConfigYAMLStr(), receiver.GenConfigYAMLStr(), processorsSections, - testbed.GetAvailablePort(t), + testutil.GetAvailablePort(t), pipelineType, sender.ProtocolName(), processorsList, @@ -119,13 +120,13 @@ func ConstructTraceSender(t *testing.T, receiver string) testbed.DataSender { var sender testbed.DataSender switch receiver { case "otlp": - sender = testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)) + sender = testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)) case "opencensus": - sender = datasenders.NewOCTraceDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)) + sender = datasenders.NewOCTraceDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)) case "jaeger": - sender = datasenders.NewJaegerGRPCDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)) + sender = datasenders.NewJaegerGRPCDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)) case "zipkin": - sender = datasenders.NewZipkinDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)) + sender = datasenders.NewZipkinDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)) default: t.Errorf("unknown receiver type: %s", receiver) } @@ -137,11 +138,11 @@ func ConstructMetricsSender(t *testing.T, receiver string) testbed.MetricDataSen var sender testbed.MetricDataSender switch receiver { case "otlp": - sender = testbed.NewOTLPMetricDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)) + sender = testbed.NewOTLPMetricDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)) case "opencensus": - sender = datasenders.NewOCMetricDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)) + sender = datasenders.NewOCMetricDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)) case "prometheus": - sender = datasenders.NewPrometheusDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)) + sender = datasenders.NewPrometheusDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)) default: t.Errorf("unknown receiver type: %s", receiver) } @@ -153,15 +154,15 @@ func ConstructReceiver(t *testing.T, exporter string) testbed.DataReceiver { var receiver testbed.DataReceiver switch exporter { case "otlp": - receiver = testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)) + receiver = testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)) case "opencensus": - receiver = datareceivers.NewOCDataReceiver(testbed.GetAvailablePort(t)) + receiver = datareceivers.NewOCDataReceiver(testutil.GetAvailablePort(t)) case "jaeger": - receiver = datareceivers.NewJaegerDataReceiver(testbed.GetAvailablePort(t)) + receiver = datareceivers.NewJaegerDataReceiver(testutil.GetAvailablePort(t)) case "zipkin": - receiver = datareceivers.NewZipkinDataReceiver(testbed.GetAvailablePort(t)) + receiver = datareceivers.NewZipkinDataReceiver(testutil.GetAvailablePort(t)) case "prometheus": - receiver = datareceivers.NewPrometheusDataReceiver(testbed.GetAvailablePort(t)) + receiver = datareceivers.NewPrometheusDataReceiver(testutil.GetAvailablePort(t)) default: t.Errorf("unknown exporter type: %s", exporter) } diff --git a/testbed/stabilitytests/metric_test.go b/testbed/stabilitytests/metric_test.go index 68fab320e020a..6a68229d4c6dc 100644 --- a/testbed/stabilitytests/metric_test.go +++ b/testbed/stabilitytests/metric_test.go @@ -6,6 +6,7 @@ package tests import ( "testing" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datareceivers" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datasenders" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" @@ -15,8 +16,8 @@ import ( func TestStabilityMetricsOTLP(t *testing.T) { scenarios.Scenario10kItemsPerSecond( t, - testbed.NewOTLPMetricDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)), + testbed.NewOTLPMetricDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)), testbed.ResourceSpec{ ExpectedMaxCPU: 50, ExpectedMaxRAM: 80, @@ -31,8 +32,8 @@ func TestStabilityMetricsOTLP(t *testing.T) { func TestStabilityMetricsOpenCensus(t *testing.T) { scenarios.Scenario10kItemsPerSecond( t, - datasenders.NewOCMetricDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - datareceivers.NewOCDataReceiver(testbed.GetAvailablePort(t)), + datasenders.NewOCMetricDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + datareceivers.NewOCDataReceiver(testutil.GetAvailablePort(t)), testbed.ResourceSpec{ ExpectedMaxCPU: 85, ExpectedMaxRAM: 86, @@ -47,8 +48,8 @@ func TestStabilityMetricsOpenCensus(t *testing.T) { func TestStabilityMetricsCarbon(t *testing.T) { scenarios.Scenario10kItemsPerSecond( t, - datasenders.NewCarbonDataSender(testbed.GetAvailablePort(t)), - datareceivers.NewCarbonDataReceiver(testbed.GetAvailablePort(t)), + datasenders.NewCarbonDataSender(testutil.GetAvailablePort(t)), + datareceivers.NewCarbonDataReceiver(testutil.GetAvailablePort(t)), testbed.ResourceSpec{ ExpectedMaxCPU: 237, ExpectedMaxRAM: 120, @@ -63,8 +64,8 @@ func TestStabilityMetricsCarbon(t *testing.T) { func TestStabilityMetricsSignalFx(t *testing.T) { scenarios.Scenario10kItemsPerSecond( t, - datasenders.NewSFxMetricDataSender(testbed.GetAvailablePort(t)), - datareceivers.NewSFxMetricsDataReceiver(testbed.GetAvailablePort(t)), + datasenders.NewSFxMetricDataSender(testutil.GetAvailablePort(t)), + datareceivers.NewSFxMetricsDataReceiver(testutil.GetAvailablePort(t)), testbed.ResourceSpec{ ExpectedMaxCPU: 120, ExpectedMaxRAM: 95, diff --git a/testbed/stabilitytests/trace_test.go b/testbed/stabilitytests/trace_test.go index 30699b485763e..3656b304112da 100644 --- a/testbed/stabilitytests/trace_test.go +++ b/testbed/stabilitytests/trace_test.go @@ -14,6 +14,7 @@ import ( "testing" "time" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datareceivers" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datasenders" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" @@ -38,8 +39,8 @@ func TestMain(m *testing.M) { func TestStabilityTracesOpenCensus(t *testing.T) { scenarios.Scenario10kItemsPerSecond( t, - datasenders.NewOCTraceDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - datareceivers.NewOCDataReceiver(testbed.GetAvailablePort(t)), + datasenders.NewOCTraceDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + datareceivers.NewOCDataReceiver(testutil.GetAvailablePort(t)), testbed.ResourceSpec{ ExpectedMaxCPU: 39, ExpectedMaxRAM: 90, @@ -54,8 +55,8 @@ func TestStabilityTracesOpenCensus(t *testing.T) { func TestStabilityTracesSAPM(t *testing.T) { scenarios.Scenario10kItemsPerSecond( t, - datasenders.NewSapmDataSender(testbed.GetAvailablePort(t), ""), - datareceivers.NewSapmDataReceiver(testbed.GetAvailablePort(t), ""), + datasenders.NewSapmDataSender(testutil.GetAvailablePort(t), ""), + datareceivers.NewSapmDataReceiver(testutil.GetAvailablePort(t), ""), testbed.ResourceSpec{ ExpectedMaxCPU: 40, ExpectedMaxRAM: 100, @@ -70,8 +71,8 @@ func TestStabilityTracesSAPM(t *testing.T) { func TestStabilityTracesOTLP(t *testing.T) { scenarios.Scenario10kItemsPerSecond( t, - testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)), + testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)), testbed.ResourceSpec{ ExpectedMaxCPU: 20, ExpectedMaxRAM: 80, @@ -86,8 +87,8 @@ func TestStabilityTracesOTLP(t *testing.T) { func TestStabilityTracesJaegerGRPC(t *testing.T) { scenarios.Scenario10kItemsPerSecond( t, - datasenders.NewJaegerGRPCDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - datareceivers.NewJaegerDataReceiver(testbed.GetAvailablePort(t)), + datasenders.NewJaegerGRPCDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + datareceivers.NewJaegerDataReceiver(testutil.GetAvailablePort(t)), testbed.ResourceSpec{ ExpectedMaxCPU: 40, ExpectedMaxRAM: 90, @@ -102,8 +103,8 @@ func TestStabilityTracesJaegerGRPC(t *testing.T) { func TestStabilityTracesZipkin(t *testing.T) { scenarios.Scenario10kItemsPerSecond( t, - datasenders.NewZipkinDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - datareceivers.NewZipkinDataReceiver(testbed.GetAvailablePort(t)), + datasenders.NewZipkinDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + datareceivers.NewZipkinDataReceiver(testutil.GetAvailablePort(t)), testbed.ResourceSpec{ ExpectedMaxCPU: 80, ExpectedMaxRAM: 110, diff --git a/testbed/testbed/utils.go b/testbed/testbed/utils.go index 11c2a30651259..92e2103a188e0 100644 --- a/testbed/testbed/utils.go +++ b/testbed/testbed/utils.go @@ -13,6 +13,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" ) +// Deprecated: [v0.94.0] Use `testutil.GetAvailablePort(t testing.TB)` instead func GetAvailablePort(t testing.TB) int { endpoint := testutil.GetAvailableLocalAddress(t) _, port, err := net.SplitHostPort(endpoint) diff --git a/testbed/tests/e2e_test.go b/testbed/tests/e2e_test.go index b0723aede1de5..1eeabb9ddafc8 100644 --- a/testbed/tests/e2e_test.go +++ b/testbed/tests/e2e_test.go @@ -15,6 +15,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" ) @@ -26,8 +27,8 @@ func TestIdleMode(t *testing.T) { resultDir, err := filepath.Abs(filepath.Join("results", t.Name())) require.NoError(t, err) - sender := testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)) - receiver := testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)) + sender := testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)) + receiver := testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)) cfg := createConfigYaml(t, sender, receiver, resultDir, nil, nil) cp := testbed.NewChildProcessCollector(testbed.WithEnvVar("GOMAXPROCS", "2")) @@ -73,8 +74,8 @@ func TestBallastMemory(t *testing.T) { dataProvider := testbed.NewPerfTestDataProvider(options) for _, test := range tests { t.Run(fmt.Sprintf("ballast-size-%d", test.ballastSize), func(t *testing.T) { - sender := testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)) - receiver := testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)) + sender := testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)) + receiver := testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)) ballastCfg := createConfigYaml( t, sender, receiver, resultDir, nil, map[string]string{"memory_ballast": fmt.Sprintf(ballastConfig, test.ballastSize)}) diff --git a/testbed/tests/log_test.go b/testbed/tests/log_test.go index aa22c123095bc..e34605af32165 100644 --- a/testbed/tests/log_test.go +++ b/testbed/tests/log_test.go @@ -9,6 +9,7 @@ package tests import ( "testing" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datareceivers" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datasenders" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" @@ -24,8 +25,8 @@ func TestLog10kDPS(t *testing.T) { }{ { name: "OTLP", - sender: testbed.NewOTLPLogsDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - receiver: testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)), + sender: testbed.NewOTLPLogsDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + receiver: testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 30, ExpectedMaxRAM: 120, @@ -33,8 +34,8 @@ func TestLog10kDPS(t *testing.T) { }, { name: "OTLP-HTTP", - sender: testbed.NewOTLPHTTPLogsDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - receiver: testbed.NewOTLPHTTPDataReceiver(testbed.GetAvailablePort(t)), + sender: testbed.NewOTLPHTTPLogsDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + receiver: testbed.NewOTLPHTTPDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 30, ExpectedMaxRAM: 120, @@ -43,7 +44,7 @@ func TestLog10kDPS(t *testing.T) { { name: "filelog", sender: datasenders.NewFileLogWriter(), - receiver: testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)), + receiver: testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 50, ExpectedMaxRAM: 120, @@ -52,7 +53,7 @@ func TestLog10kDPS(t *testing.T) { { name: "filelog checkpoints", sender: datasenders.NewFileLogWriter(), - receiver: testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)), + receiver: testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 50, ExpectedMaxRAM: 120, @@ -62,7 +63,7 @@ func TestLog10kDPS(t *testing.T) { { name: "kubernetes containers", sender: datasenders.NewKubernetesContainerWriter(), - receiver: testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)), + receiver: testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 110, ExpectedMaxRAM: 150, @@ -71,7 +72,7 @@ func TestLog10kDPS(t *testing.T) { { name: "k8s CRI-Containerd", sender: datasenders.NewKubernetesCRIContainerdWriter(), - receiver: testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)), + receiver: testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 100, ExpectedMaxRAM: 150, @@ -80,7 +81,7 @@ func TestLog10kDPS(t *testing.T) { { name: "k8s CRI-Containerd no attr ops", sender: datasenders.NewKubernetesCRIContainerdNoAttributesOpsWriter(), - receiver: testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)), + receiver: testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 100, ExpectedMaxRAM: 150, @@ -89,7 +90,7 @@ func TestLog10kDPS(t *testing.T) { { name: "CRI-Containerd", sender: datasenders.NewCRIContainerdWriter(), - receiver: testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)), + receiver: testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 100, ExpectedMaxRAM: 150, @@ -97,8 +98,8 @@ func TestLog10kDPS(t *testing.T) { }, { name: "syslog-tcp-batch-1", - sender: datasenders.NewTCPUDPWriter("tcp", testbed.DefaultHost, testbed.GetAvailablePort(t), 1), - receiver: testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)), + sender: datasenders.NewTCPUDPWriter("tcp", testbed.DefaultHost, testutil.GetAvailablePort(t), 1), + receiver: testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 80, ExpectedMaxRAM: 150, @@ -106,8 +107,8 @@ func TestLog10kDPS(t *testing.T) { }, { name: "syslog-tcp-batch-100", - sender: datasenders.NewTCPUDPWriter("tcp", testbed.DefaultHost, testbed.GetAvailablePort(t), 100), - receiver: testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)), + sender: datasenders.NewTCPUDPWriter("tcp", testbed.DefaultHost, testutil.GetAvailablePort(t), 100), + receiver: testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 80, ExpectedMaxRAM: 150, @@ -115,8 +116,8 @@ func TestLog10kDPS(t *testing.T) { }, { name: "FluentForward-SplunkHEC", - sender: datasenders.NewFluentLogsForwarder(t, testbed.GetAvailablePort(t)), - receiver: datareceivers.NewSplunkHECDataReceiver(testbed.GetAvailablePort(t)), + sender: datasenders.NewFluentLogsForwarder(t, testutil.GetAvailablePort(t)), + receiver: datareceivers.NewSplunkHECDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 60, ExpectedMaxRAM: 150, @@ -124,8 +125,8 @@ func TestLog10kDPS(t *testing.T) { }, { name: "tcp-batch-1", - sender: datasenders.NewTCPUDPWriter("tcp", testbed.DefaultHost, testbed.GetAvailablePort(t), 1), - receiver: testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)), + sender: datasenders.NewTCPUDPWriter("tcp", testbed.DefaultHost, testutil.GetAvailablePort(t), 1), + receiver: testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 80, ExpectedMaxRAM: 150, @@ -133,8 +134,8 @@ func TestLog10kDPS(t *testing.T) { }, { name: "tcp-batch-100", - sender: datasenders.NewTCPUDPWriter("tcp", testbed.DefaultHost, testbed.GetAvailablePort(t), 100), - receiver: testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)), + sender: datasenders.NewTCPUDPWriter("tcp", testbed.DefaultHost, testutil.GetAvailablePort(t), 100), + receiver: testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 80, ExpectedMaxRAM: 150, @@ -164,7 +165,7 @@ func TestLog10kDPS(t *testing.T) { } func TestLogOtlpSendingQueue(t *testing.T) { - otlpreceiver10 := testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)) + otlpreceiver10 := testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)) otlpreceiver10.WithRetry(` retry_on_failure: enabled: true @@ -177,7 +178,7 @@ func TestLogOtlpSendingQueue(t *testing.T) { t.Run("OTLP-sending-queue-full", func(t *testing.T) { ScenarioSendingQueuesFull( t, - testbed.NewOTLPLogsDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), + testbed.NewOTLPLogsDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), otlpreceiver10, testbed.LoadOptions{ DataItemsPerSecond: 100, @@ -193,7 +194,7 @@ func TestLogOtlpSendingQueue(t *testing.T) { nil) }) - otlpreceiver100 := testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)) + otlpreceiver100 := testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)) otlpreceiver100.WithRetry(` retry_on_failure: enabled: true @@ -206,7 +207,7 @@ func TestLogOtlpSendingQueue(t *testing.T) { t.Run("OTLP-sending-queue-not-full", func(t *testing.T) { ScenarioSendingQueuesNotFull( t, - testbed.NewOTLPLogsDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), + testbed.NewOTLPLogsDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), otlpreceiver100, testbed.LoadOptions{ DataItemsPerSecond: 100, diff --git a/testbed/tests/metric_test.go b/testbed/tests/metric_test.go index 98036e3d2224f..32adc0d1ea9b9 100644 --- a/testbed/tests/metric_test.go +++ b/testbed/tests/metric_test.go @@ -14,6 +14,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datareceivers" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datasenders" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" @@ -29,8 +30,8 @@ func TestMetric10kDPS(t *testing.T) { }{ { name: "Carbon", - sender: datasenders.NewCarbonDataSender(testbed.GetAvailablePort(t)), - receiver: datareceivers.NewCarbonDataReceiver(testbed.GetAvailablePort(t)), + sender: datasenders.NewCarbonDataSender(testutil.GetAvailablePort(t)), + receiver: datareceivers.NewCarbonDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 237, ExpectedMaxRAM: 100, @@ -38,8 +39,8 @@ func TestMetric10kDPS(t *testing.T) { }, { name: "OpenCensus", - sender: datasenders.NewOCMetricDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - receiver: datareceivers.NewOCDataReceiver(testbed.GetAvailablePort(t)), + sender: datasenders.NewOCMetricDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + receiver: datareceivers.NewOCDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 85, ExpectedMaxRAM: 100, @@ -47,8 +48,8 @@ func TestMetric10kDPS(t *testing.T) { }, { name: "OTLP", - sender: testbed.NewOTLPMetricDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - receiver: testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)), + sender: testbed.NewOTLPMetricDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + receiver: testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 60, ExpectedMaxRAM: 105, @@ -56,8 +57,8 @@ func TestMetric10kDPS(t *testing.T) { }, { name: "OTLP-HTTP", - sender: testbed.NewOTLPHTTPMetricDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - receiver: testbed.NewOTLPHTTPDataReceiver(testbed.GetAvailablePort(t)), + sender: testbed.NewOTLPHTTPMetricDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + receiver: testbed.NewOTLPHTTPDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 60, ExpectedMaxRAM: 100, @@ -65,8 +66,8 @@ func TestMetric10kDPS(t *testing.T) { }, { name: "SignalFx", - sender: datasenders.NewSFxMetricDataSender(testbed.GetAvailablePort(t)), - receiver: datareceivers.NewSFxMetricsDataReceiver(testbed.GetAvailablePort(t)), + sender: datasenders.NewSFxMetricDataSender(testutil.GetAvailablePort(t)), + receiver: datareceivers.NewSFxMetricsDataReceiver(testutil.GetAvailablePort(t)), resourceSpec: testbed.ResourceSpec{ ExpectedMaxCPU: 120, ExpectedMaxRAM: 98, @@ -111,8 +112,8 @@ func TestMetricsFromFile(t *testing.T) { } agentProc := testbed.NewChildProcessCollector(testbed.WithEnvVar("GOMAXPROCS", "2")) - sender := testbed.NewOTLPMetricDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)) - receiver := testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)) + sender := testbed.NewOTLPMetricDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)) + receiver := testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)) configStr := createConfigYaml(t, sender, receiver, resultDir, nil, nil) configCleanup, err := agentProc.PrepareConfig(configStr) diff --git a/testbed/tests/resource_processor_test.go b/testbed/tests/resource_processor_test.go index d117467725764..b30c93de864ee 100644 --- a/testbed/tests/resource_processor_test.go +++ b/testbed/tests/resource_processor_test.go @@ -11,6 +11,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/pmetric" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" ) @@ -97,8 +98,8 @@ func getResourceProcessorTestCases() []resourceProcessorTestCase { } func TestMetricResourceProcessor(t *testing.T) { - sender := testbed.NewOTLPMetricDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)) - receiver := testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)) + sender := testbed.NewOTLPMetricDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)) + receiver := testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)) tests := getResourceProcessorTestCases() diff --git a/testbed/tests/scenarios.go b/testbed/tests/scenarios.go index d77dddf0e84a4..29fdfe393c145 100644 --- a/testbed/tests/scenarios.go +++ b/testbed/tests/scenarios.go @@ -18,6 +18,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/plog" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" ) @@ -275,8 +276,8 @@ func Scenario1kSPSWithAttrs(t *testing.T, args []string, tests []TestCase, proce require.NoError(t, err) // Create sender and receiver on available ports. - sender := testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)) - receiver := testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)) + sender := testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)) + receiver := testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)) // Prepare config. configStr := createConfigYaml(t, sender, receiver, resultDir, processors, extensions) diff --git a/testbed/tests/syslog_integration_test.go b/testbed/tests/syslog_integration_test.go index 49d59eb5cc8f0..933d1d8104e4f 100644 --- a/testbed/tests/syslog_integration_test.go +++ b/testbed/tests/syslog_integration_test.go @@ -15,6 +15,7 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datareceivers" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/testbed" ) @@ -104,8 +105,8 @@ func componentFactories(t *testing.T) otelcol.Factories { func complementaryTest(t *testing.T, rfc string, expectedData []expectedDataType) { // Prepare ports - port := testbed.GetAvailablePort(t) - inputPort := testbed.GetAvailablePort(t) + port := testutil.GetAvailablePort(t) + inputPort := testutil.GetAvailablePort(t) // Start SyslogDataReceiver syslogReceiver := datareceivers.NewSyslogDataReceiver(rfc, port) diff --git a/testbed/tests/trace_test.go b/testbed/tests/trace_test.go index faad714670de6..f81f403b00d46 100644 --- a/testbed/tests/trace_test.go +++ b/testbed/tests/trace_test.go @@ -19,6 +19,7 @@ import ( "go.opentelemetry.io/collector/pdata/ptrace" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/idutils" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datareceivers" "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datasenders" @@ -39,8 +40,8 @@ func TestTrace10kSPS(t *testing.T) { }{ { "OpenCensus", - datasenders.NewOCTraceDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - datareceivers.NewOCDataReceiver(testbed.GetAvailablePort(t)), + datasenders.NewOCTraceDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + datareceivers.NewOCDataReceiver(testutil.GetAvailablePort(t)), testbed.ResourceSpec{ ExpectedMaxCPU: 39, ExpectedMaxRAM: 100, @@ -48,8 +49,8 @@ func TestTrace10kSPS(t *testing.T) { }, { "OTLP-gRPC", - testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)), + testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)), testbed.ResourceSpec{ ExpectedMaxCPU: 20, ExpectedMaxRAM: 100, @@ -57,8 +58,8 @@ func TestTrace10kSPS(t *testing.T) { }, { "OTLP-gRPC-gzip", - testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)).WithCompression("gzip"), + testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)).WithCompression("gzip"), testbed.ResourceSpec{ ExpectedMaxCPU: 30, ExpectedMaxRAM: 100, @@ -66,8 +67,8 @@ func TestTrace10kSPS(t *testing.T) { }, { "OTLP-HTTP", - testbed.NewOTLPHTTPTraceDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t), ""), - testbed.NewOTLPHTTPDataReceiver(testbed.GetAvailablePort(t)), + testbed.NewOTLPHTTPTraceDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t), ""), + testbed.NewOTLPHTTPDataReceiver(testutil.GetAvailablePort(t)), testbed.ResourceSpec{ ExpectedMaxCPU: 20, ExpectedMaxRAM: 100, @@ -75,8 +76,8 @@ func TestTrace10kSPS(t *testing.T) { }, { "OTLP-HTTP-gzip", - testbed.NewOTLPHTTPTraceDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t), "gzip"), - testbed.NewOTLPHTTPDataReceiver(testbed.GetAvailablePort(t)).WithCompression("gzip"), + testbed.NewOTLPHTTPTraceDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t), "gzip"), + testbed.NewOTLPHTTPDataReceiver(testutil.GetAvailablePort(t)).WithCompression("gzip"), testbed.ResourceSpec{ ExpectedMaxCPU: 25, ExpectedMaxRAM: 100, @@ -84,8 +85,8 @@ func TestTrace10kSPS(t *testing.T) { }, { "OTLP-HTTP-zstd", - testbed.NewOTLPHTTPTraceDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t), "zstd"), - testbed.NewOTLPHTTPDataReceiver(testbed.GetAvailablePort(t)).WithCompression("zstd"), + testbed.NewOTLPHTTPTraceDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t), "zstd"), + testbed.NewOTLPHTTPDataReceiver(testutil.GetAvailablePort(t)).WithCompression("zstd"), testbed.ResourceSpec{ ExpectedMaxCPU: 22, ExpectedMaxRAM: 220, @@ -93,8 +94,8 @@ func TestTrace10kSPS(t *testing.T) { }, { "SAPM", - datasenders.NewSapmDataSender(testbed.GetAvailablePort(t), ""), - datareceivers.NewSapmDataReceiver(testbed.GetAvailablePort(t), ""), + datasenders.NewSapmDataSender(testutil.GetAvailablePort(t), ""), + datareceivers.NewSapmDataReceiver(testutil.GetAvailablePort(t), ""), testbed.ResourceSpec{ ExpectedMaxCPU: 32, ExpectedMaxRAM: 100, @@ -102,8 +103,8 @@ func TestTrace10kSPS(t *testing.T) { }, { "SAPM-gzip", - datasenders.NewSapmDataSender(testbed.GetAvailablePort(t), "gzip"), - datareceivers.NewSapmDataReceiver(testbed.GetAvailablePort(t), "gzip"), + datasenders.NewSapmDataSender(testutil.GetAvailablePort(t), "gzip"), + datareceivers.NewSapmDataReceiver(testutil.GetAvailablePort(t), "gzip"), testbed.ResourceSpec{ ExpectedMaxCPU: 35, ExpectedMaxRAM: 110, @@ -111,8 +112,8 @@ func TestTrace10kSPS(t *testing.T) { }, { "SAPM-zstd", - datasenders.NewSapmDataSender(testbed.GetAvailablePort(t), "zstd"), - datareceivers.NewSapmDataReceiver(testbed.GetAvailablePort(t), "zstd"), + datasenders.NewSapmDataSender(testutil.GetAvailablePort(t), "zstd"), + datareceivers.NewSapmDataReceiver(testutil.GetAvailablePort(t), "zstd"), testbed.ResourceSpec{ ExpectedMaxCPU: 32, ExpectedMaxRAM: 300, @@ -120,8 +121,8 @@ func TestTrace10kSPS(t *testing.T) { }, { "Zipkin", - datasenders.NewZipkinDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - datareceivers.NewZipkinDataReceiver(testbed.GetAvailablePort(t)), + datasenders.NewZipkinDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + datareceivers.NewZipkinDataReceiver(testutil.GetAvailablePort(t)), testbed.ResourceSpec{ ExpectedMaxCPU: 80, ExpectedMaxRAM: 120, @@ -151,11 +152,11 @@ func TestTrace10kSPS(t *testing.T) { } func TestTrace10kSPSJaegerGRPC(t *testing.T) { - port := testbed.GetAvailablePort(t) + port := testutil.GetAvailablePort(t) receiver := datareceivers.NewJaegerDataReceiver(port) Scenario10kItemsPerSecondAlternateBackend( t, - datasenders.NewJaegerGRPCDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), + datasenders.NewJaegerGRPCDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), receiver, testbed.NewOTLPDataReceiver(port), testbed.ResourceSpec{ @@ -203,8 +204,8 @@ func TestTraceNoBackend10kSPS(t *testing.T) { t.Run(testConf.Name, func(t *testing.T) { ScenarioTestTraceNoBackend10kSPS( t, - testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)), + testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)), testbed.ResourceSpec{ExpectedMaxCPU: 80, ExpectedMaxRAM: testConf.ExpectedMaxRAM}, performanceResultsSummary, testConf, @@ -417,8 +418,8 @@ func TestTraceAttributesProcessor(t *testing.T) { }{ { "OTLP", - testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)), - testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)), + testbed.NewOTLPTraceDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)), + testbed.NewOTLPDataReceiver(testutil.GetAvailablePort(t)), }, } @@ -507,8 +508,8 @@ func TestTraceAttributesProcessor(t *testing.T) { } func TestTraceAttributesProcessorJaegerGRPC(t *testing.T) { - port := testbed.GetAvailablePort(t) - sender := datasenders.NewJaegerGRPCDataSender(testbed.DefaultHost, testbed.GetAvailablePort(t)) + port := testutil.GetAvailablePort(t) + sender := datasenders.NewJaegerGRPCDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)) receiver := datareceivers.NewJaegerDataReceiver(port) resultDir, err := filepath.Abs(filepath.Join("results", t.Name())) require.NoError(t, err)